mirror of
https://github.com/azahar-emu/azahar
synced 2025-11-15 19:39:58 +01:00
* remove the telemetry except from the renderers as I'm not being capable to remove it from there
* remove the telemetry except from the renderers as I'm not being capable to remove it from there
* Remove remainder of non-functional Telemetry and Citra Web Services
Squashed commit of the following:
commit f6dd4d4579c91db323877f0d08b9c01c82e1bb32
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 14:02:26 2024 -0600
gl_driver.h: add back missing functions
commit 8f14384e7a7b763c3f2ccb3af6b5a59df641d9ee
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 13:56:16 2024 -0600
gl_driver.cpp: add back missing functions
commit 5c802524b01a6eb05952d88ccf9dd78d63baee0a
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 13:39:46 2024 -0600
apply clang-format
commit e8f62a7d3ee8a3da885a28bce21bcfcb84f13a84
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 13:16:22 2024 -0600
remove web_tab
commit ced7f1e4909ae7b2714a96e3c3fa0500e8c62968
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 13:13:47 2024 -0600
remove unused call?
commit f10e05da887e4570853fae2bd55a71087b4bcc77
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 13:03:47 2024 -0600
fix build errors
commit 0489c1770b4b48d51f626145ae9235d3c81029fc
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 12:54:35 2024 -0600
Remove deleted files
commit b2eb56f5a1f01663cc9874d99fe77ee64b48622b
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 12:43:17 2024 -0600
Remove ConfigureWeb
commit b96f7c724006b2c5ee2272becaa70584fe90d012
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 11:49:51 2024 -0600
remove unused DebugHandler
commit 91ddf16f63f9ae07b0cb2768171728dc878d1653
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 11:41:31 2024 -0600
remove CollectToolingInfo() reference
commit 3909ac0502f23f8fb54944b53d5072b6986f8ffd
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 11:33:39 2024 -0600
Fix "clean renderer_vulkan.cpp"
This reverts commit 8a882658da9fabca40d71d73bfaf3bb5702acd72.
commit f4a10c4e4f27471b0a263ac363a6fa2abc9d6dc9
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 11:25:12 2024 -0600
remove Core() references
commit 5593b8484e7c9f525ea218902dd2c13148d86b37
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 11:09:26 2024 -0600
clean core/core.cpp
commit 55bbd8ad283297ef79db11e19ca6303fdfba6626
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 11:03:45 2024 -0600
apply clang-format
commit 3707a0b2705dd415876130c9c90b0916bdea11db
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 11:02:16 2024 -0600
citra_qt/main.h
commit ddbdea9be4d8179a333e04e7c302e215868715a9
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 11:01:30 2024 -0600
clean common/detached_tasks.h
commit b513ba3b91ebc81bddd634b5690b6434824e1c7a
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:58:51 2024 -0600
clean android/app/src/main/jni/default_ini.h
commit b6ba7d7cd730393883fdca294c651a4186727b55
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:58:14 2024 -0600
clean android/app/src/main/jni/native.cpp
commit 2351305bb24b005920af0f3f7bb6bbb5bb3124bd
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:56:59 2024 -0600
network/network_settings.h
commit 5b4c1ebb97c7fad5daf7789e1d3640041c2412fb
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:55:53 2024 -0600
clean citra_qt/configuration/configure_web.ui
commit 9526d5122995c2e9c52b4d93b6e836a2ea4c80ef
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:54:53 2024 -0600
citra_qt/configuration/config.cpp
commit ec6fe57412ce97e06096fc07f8b86dd080b7b944
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:53:50 2024 -0600
clean citra/default_ini.h
commit acba1cf7e94de2fa87174e9f6d7c7c4554146352
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:52:47 2024 -0600
clean citra/config.cpp
commit 02888777590d4e4bf1423e168a672ca0c5e140e5
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:50:42 2024 -0600
clean vk_instance.cpp
commit eae451d5825b3601382c3a6dd08a3bde5c7a9460
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:48:53 2024 -0600
clean vk_instanch.h
commit 8a882658da9fabca40d71d73bfaf3bb5702acd72
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:47:11 2024 -0600
clean renderer_vulkan.cpp
commit ea6df111bc447913d2999acd86de984acced7eeb
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:45:51 2024 -0600
clean renderer_opengl.cpp
commit 6b1bea0ef8cf8831c520d1c4e90b9d73d421c764
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:44:17 2024 -0600
clean pica_to_gl.h
commit c12e984045a430cb10500241ada68701f73c85ac
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:42:48 2024 -0600
clean gl_driver.h
commit ca3fe7801fff125a1ab8706bfc3998ca2928bded
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:40:14 2024 -0600
clean gl_driver.cpp
commit d57381c38b217a423a7039bc7b413d79f59c2ff1
Author: Reg Tiangha <rtiangha@users.noreply.github.com>
Date: Fri Mar 29 10:38:44 2024 -0600
delete telemetry files
commit 1af826d1a045c5568a0d9ef4ca423514f298aee2
Author: Miguel <81558772+Miguel-hrvs@users.noreply.github.com>
Date: Wed Mar 27 16:17:58 2024 +0100
remove the telemetry except from the renderers as I'm not being capable to remove it from there
* rebase renderer_vulkan
* clean up renderer_vulkan
* bring back vulkan gpu logging
* clang-format vk_instance.h
* fix-formatting
---------
Co-authored-by: Reg Tiangha <rtiangha@users.noreply.github.com>
205 lines
6.4 KiB
CMake
205 lines
6.4 KiB
CMake
# Add a custom command to generate a new shader_cache_version hash when any of the following files change
|
|
# NOTE: This is an approximation of what files affect shader generation, its possible something else
|
|
# could affect the result, but much more unlikely than the following files. Keeping a list of files
|
|
# like this allows for much better caching since it doesn't force the user to recompile binary shaders every update
|
|
set(VIDEO_CORE "${CMAKE_SOURCE_DIR}/src/video_core")
|
|
|
|
# Pass the path to git to the GenerateSCMRev.cmake as well
|
|
find_package(Git QUIET)
|
|
|
|
add_custom_command(OUTPUT scm_rev.cpp
|
|
COMMAND ${CMAKE_COMMAND}
|
|
-DSRC_DIR="${CMAKE_SOURCE_DIR}"
|
|
-DGIT_EXECUTABLE="${GIT_EXECUTABLE}"
|
|
-P "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake"
|
|
DEPENDS
|
|
# WARNING! It was too much work to try and make a common location for this list,
|
|
# so if you need to change it, please update CMakeModules/GenerateSCMRev.cmake as well
|
|
"${VIDEO_CORE}/renderer_opengl/gl_shader_disk_cache.cpp"
|
|
"${VIDEO_CORE}/renderer_opengl/gl_shader_disk_cache.h"
|
|
"${VIDEO_CORE}/renderer_opengl/gl_shader_util.cpp"
|
|
"${VIDEO_CORE}/renderer_opengl/gl_shader_util.h"
|
|
"${VIDEO_CORE}/renderer_vulkan/vk_shader_util.cpp"
|
|
"${VIDEO_CORE}/renderer_vulkan/vk_shader_util.h"
|
|
"${VIDEO_CORE}/shader/generator/glsl_fs_shader_gen.cpp"
|
|
"${VIDEO_CORE}/shader/generator/glsl_fs_shader_gen.h"
|
|
"${VIDEO_CORE}/shader/generator/glsl_shader_decompiler.cpp"
|
|
"${VIDEO_CORE}/shader/generator/glsl_shader_decompiler.h"
|
|
"${VIDEO_CORE}/shader/generator/glsl_shader_gen.cpp"
|
|
"${VIDEO_CORE}/shader/generator/glsl_shader_gen.h"
|
|
"${VIDEO_CORE}/shader/generator/pica_fs_config.cpp"
|
|
"${VIDEO_CORE}/shader/generator/pica_fs_config.h"
|
|
"${VIDEO_CORE}/shader/generator/shader_gen.cpp"
|
|
"${VIDEO_CORE}/shader/generator/shader_gen.h"
|
|
"${VIDEO_CORE}/shader/generator/shader_uniforms.cpp"
|
|
"${VIDEO_CORE}/shader/generator/shader_uniforms.h"
|
|
"${VIDEO_CORE}/shader/generator/spv_fs_shader_gen.cpp"
|
|
"${VIDEO_CORE}/shader/generator/spv_fs_shader_gen.h"
|
|
"${VIDEO_CORE}/shader/shader.cpp"
|
|
"${VIDEO_CORE}/shader/shader.h"
|
|
"${VIDEO_CORE}/pica/regs_framebuffer.h"
|
|
"${VIDEO_CORE}/pica/regs_lighting.h"
|
|
"${VIDEO_CORE}/pica/regs_pipeline.h"
|
|
"${VIDEO_CORE}/pica/regs_rasterizer.h"
|
|
"${VIDEO_CORE}/pica/regs_shader.h"
|
|
"${VIDEO_CORE}/pica/regs_texturing.h"
|
|
"${VIDEO_CORE}/pica/regs_internal.cpp"
|
|
"${VIDEO_CORE}/pica/regs_internal.h"
|
|
# and also check that the scm_rev files haven't changed
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.h"
|
|
# technically we should regenerate if the git version changed, but its not worth the effort imo
|
|
"${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake"
|
|
)
|
|
|
|
add_library(citra_common STATIC
|
|
aarch64/cpu_detect.cpp
|
|
aarch64/cpu_detect.h
|
|
aarch64/oaknut_abi.h
|
|
aarch64/oaknut_util.h
|
|
alignment.h
|
|
android_storage.h
|
|
android_storage.cpp
|
|
announce_multiplayer_room.h
|
|
arch.h
|
|
archives.h
|
|
assert.h
|
|
atomic_ops.h
|
|
detached_tasks.cpp
|
|
detached_tasks.h
|
|
bit_field.h
|
|
bit_set.h
|
|
bounded_threadsafe_queue.h
|
|
cityhash.cpp
|
|
cityhash.h
|
|
color.h
|
|
common_funcs.h
|
|
common_paths.h
|
|
common_precompiled_headers.h
|
|
common_types.h
|
|
construct.h
|
|
dynamic_library/dynamic_library.cpp
|
|
dynamic_library/dynamic_library.h
|
|
dynamic_library/ffmpeg.cpp
|
|
dynamic_library/ffmpeg.h
|
|
error.cpp
|
|
error.h
|
|
expected.h
|
|
file_util.cpp
|
|
file_util.h
|
|
hash.h
|
|
literals.h
|
|
logging/backend.cpp
|
|
logging/backend.h
|
|
logging/filter.cpp
|
|
logging/filter.h
|
|
logging/formatter.h
|
|
logging/log.h
|
|
logging/log_entry.h
|
|
logging/text_formatter.cpp
|
|
logging/text_formatter.h
|
|
logging/types.h
|
|
math_util.h
|
|
memory_detect.cpp
|
|
memory_detect.h
|
|
memory_ref.h
|
|
memory_ref.cpp
|
|
microprofile.cpp
|
|
microprofile.h
|
|
microprofileui.h
|
|
param_package.cpp
|
|
param_package.h
|
|
polyfill_thread.h
|
|
precompiled_headers.h
|
|
quaternion.h
|
|
ring_buffer.h
|
|
scm_rev.cpp
|
|
scm_rev.h
|
|
scope_exit.h
|
|
settings.cpp
|
|
settings.h
|
|
slot_vector.h
|
|
serialization/atomic.h
|
|
serialization/boost_discrete_interval.hpp
|
|
serialization/boost_flat_set.h
|
|
serialization/boost_small_vector.hpp
|
|
serialization/boost_std_variant.hpp
|
|
serialization/boost_vector.hpp
|
|
static_lru_cache.h
|
|
string_literal.h
|
|
string_util.cpp
|
|
string_util.h
|
|
swap.h
|
|
texture.cpp
|
|
texture.h
|
|
thread.cpp
|
|
thread.h
|
|
thread_queue_list.h
|
|
thread_worker.h
|
|
threadsafe_queue.h
|
|
timer.cpp
|
|
timer.h
|
|
unique_function.h
|
|
vector_math.h
|
|
web_result.h
|
|
x64/cpu_detect.cpp
|
|
x64/cpu_detect.h
|
|
x64/xbyak_abi.h
|
|
x64/xbyak_util.h
|
|
zstd_compression.cpp
|
|
zstd_compression.h
|
|
)
|
|
|
|
if (UNIX AND NOT APPLE)
|
|
target_sources(citra_common PRIVATE
|
|
linux/gamemode.cpp
|
|
linux/gamemode.h
|
|
)
|
|
|
|
target_link_libraries(citra_common PRIVATE gamemode)
|
|
endif()
|
|
|
|
if (APPLE)
|
|
target_sources(citra_common PUBLIC
|
|
apple_authorization.h
|
|
apple_authorization.cpp
|
|
)
|
|
endif()
|
|
|
|
if (MSVC)
|
|
target_compile_options(citra_common PRIVATE
|
|
/W4
|
|
|
|
/we4242 # 'identifier': conversion from 'type1' to 'type2', possible loss of data
|
|
/we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data
|
|
/we4800 # Implicit conversion from 'type' to bool. Possible information loss
|
|
)
|
|
else()
|
|
target_compile_options(citra_common PRIVATE
|
|
$<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
|
|
)
|
|
endif()
|
|
|
|
create_target_directory_groups(citra_common)
|
|
|
|
target_link_libraries(citra_common PUBLIC fmt library-headers microprofile Boost::boost Boost::serialization Boost::iostreams)
|
|
target_link_libraries(citra_common PRIVATE zstd)
|
|
|
|
if ("x86_64" IN_LIST ARCHITECTURE)
|
|
target_link_libraries(citra_common PRIVATE xbyak)
|
|
endif()
|
|
|
|
if ("arm64" IN_LIST ARCHITECTURE)
|
|
target_link_libraries(citra_common PRIVATE oaknut)
|
|
endif()
|
|
|
|
if (CITRA_USE_PRECOMPILED_HEADERS)
|
|
target_precompile_headers(citra_common PRIVATE precompiled_headers.h)
|
|
endif()
|
|
|
|
find_library(BACKTRACE_LIBRARY backtrace)
|
|
if (BACKTRACE_LIBRARY AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND CMAKE_CXX_COMPILER_ID STREQUAL GNU)
|
|
target_link_libraries(citra_common PRIVATE ${BACKTRACE_LIBRARY} dl)
|
|
target_compile_definitions(citra_common PRIVATE CITRA_LINUX_GCC_BACKTRACE)
|
|
endif()
|