ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 6c98e7b538 into 53b54406bd

This commit is contained in:
unexploredtest 2025-05-26 21:44:18 -07:00 committed by GitHub
parent 53b54406bd 6c98e7b538
commit e75d6fb909
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/glslang/CMakeLists.txt vendored
View File

@ -77,5 +77,5 @@ dolphin_disable_warnings(glslang)
target_include_directories(glslang
PRIVATE
${CMAKE_SOURCE_DIR}/Externals/glslang
${CMAKE_CURRENT_SOURCE_DIR}
)

14
Source/Android/jni/CMakeLists.txt
View File

@ -57,17 +57,17 @@ PRIVATE
target_include_directories(main
PRIVATE
${CMAKE_SOURCE_DIR}/Externals/libadrenotools/include
${CMAKE_SOURCE_DIR}/Externals/VulkanMemoryAllocator/include
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/libadrenotools/include
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/VulkanMemoryAllocator/include
)
file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/)
file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/)
file(COPY ${CMAKE_SOURCE_DIR}/Data/Sys DESTINATION ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Android/app/src/main/assets/)
file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Android/app/src/main/assets/Sys/)
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Sys DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Android/app/src/main/assets/)
# Delete folders that aren't used by the Android version of Dolphin
file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/Resources/)
file(REMOVE_RECURSE ${CMAKE_SOURCE_DIR}/Source/Android/app/src/main/assets/Sys/Themes/)
file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Android/app/src/main/assets/Sys/Resources/)
file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/../../../Source/Android/app/src/main/assets/Sys/Themes/)
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} main)

6
Source/Core/CMakeLists.txt
View File

@ -69,7 +69,7 @@ if (APPLE AND ENABLE_QT)
if (MACOS_CODE_SIGNING)
add_custom_command(TARGET build_final_bundle
POST_BUILD
COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh"
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../../Tools/mac-codesign.sh"
"-t"
"${MACOS_CODE_SIGNING_IDENTITY}"
"${DOLPHIN_MAC_BUNDLE}/Contents/Helpers/Dolphin Updater.app")
@ -79,9 +79,9 @@ if (APPLE AND ENABLE_QT)
if (MACOS_CODE_SIGNING)
add_custom_command(TARGET build_final_bundle
POST_BUILD
COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh"
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../../Tools/mac-codesign.sh"
"-t"
"-e" "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu$<$<CONFIG:Debug>:Debug>.entitlements"
"-e" "${CMAKE_CURRENT_SOURCE_DIR}/../../Source/Core/DolphinQt/DolphinEmu$<$<CONFIG:Debug>:Debug>.entitlements"
"${MACOS_CODE_SIGNING_IDENTITY}"
"${DOLPHIN_MAC_BUNDLE}")
endif()

32
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -5,9 +5,9 @@ endif()
if (MSVC)
if(_M_ARM_64)
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.5.1/ARM64")
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/Qt/Qt6.5.1/ARM64")
else()
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.5.1/x64")
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/Qt/Qt6.5.1/x64")
endif()
endif()
@ -476,17 +476,17 @@ if(WIN32)
# Copy Sys dir
add_custom_command(TARGET dolphin-emu POST_BUILD
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
)
# Copy COPYING
add_custom_command(TARGET dolphin-emu POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/COPYING"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../../../COPYING" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/COPYING"
)
# Copy Licenses dir
add_custom_command(TARGET dolphin-emu POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/LICENSES" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Licenses"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../../../LICENSES" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Licenses"
)
# Copy qt.conf
@ -531,12 +531,12 @@ find_package(Gettext)
if(WIN32 AND NOT Gettext_FOUND)
message(STATUS "Using Gettext from Externals")
set(GETTEXT_MSGFMT_EXECUTABLE "${CMAKE_SOURCE_DIR}/Externals/gettext/msgfmt.exe")
set(GETTEXT_MSGFMT_EXECUTABLE "${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/gettext/msgfmt.exe")
endif()
if(GETTEXT_MSGFMT_EXECUTABLE)
set(pot_file "${CMAKE_SOURCE_DIR}/Languages/po/dolphin-emu.pot")
file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
set(pot_file "${CMAKE_CURRENT_SOURCE_DIR}/../../../Languages/po/dolphin-emu.pot")
file(GLOB LINGUAS ${CMAKE_CURRENT_SOURCE_DIR}/../../../Languages/po/*.po)
target_sources(dolphin-emu PRIVATE ${pot_file} ${LINGUAS})
source_group("Localization" FILES ${LINGUAS})
@ -594,8 +594,8 @@ if(APPLE)
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
# Copy icon into the bundle
target_sources(dolphin-emu PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
target_sources(dolphin-emu PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Dolphin.icns")
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
# Manually include plugins
find_package(Qt6QMacStylePlugin REQUIRED PATHS ${Qt6Widgets_DIR})
@ -611,14 +611,14 @@ if(APPLE)
set_source_files_properties("${qtmacstyle_location}" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/styles)
# Copy resources into the bundle
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/Data/Sys")
file(GLOB_RECURSE resources RELATIVE "${CMAKE_SOURCE_DIR}/Data" "${CMAKE_SOURCE_DIR}/Data/Sys/*")
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Sys")
file(GLOB_RECURSE resources RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../../../Data" "${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Sys/*")
foreach(res ${resources})
target_sources(dolphin-emu PRIVATE "${CMAKE_SOURCE_DIR}/Data/${res}")
target_sources(dolphin-emu PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/${res}")
get_filename_component(resdir "${res}" DIRECTORY)
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/${res}" PROPERTIES
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/${res}" PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources/${resdir}")
source_group("Resources" FILES "${CMAKE_SOURCE_DIR}/Data/${res}")
source_group("Resources" FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/${res}")
endforeach()
include(DolphinInjectVersionInfo)
@ -655,7 +655,7 @@ if(APPLE)
if(MACOS_CODE_SIGNING)
add_custom_command(TARGET dolphin-emu
POST_BUILD
COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh"
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../../../Tools/mac-codesign.sh"
"-e" "${CMAKE_CURRENT_SOURCE_DIR}/DolphinEmu$<$<CONFIG:Debug>:Debug>.entitlements"
"${MACOS_CODE_SIGNING_IDENTITY}"
"$<TARGET_BUNDLE_DIR:dolphin-emu>"

6
Source/Core/MacUpdater/CMakeLists.txt
View File

@ -22,8 +22,8 @@ set_target_properties(MacUpdater PROPERTIES
target_compile_options(MacUpdater PRIVATE -x objective-c++)
# Copy icon into the bundle
target_sources(MacUpdater PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
target_sources(MacUpdater PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Dolphin.icns")
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/../../../Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
target_link_libraries(MacUpdater PRIVATE
"-framework Cocoa"
@ -71,7 +71,7 @@ endif()
if(MACOS_CODE_SIGNING)
add_custom_command(TARGET MacUpdater
POST_BUILD
COMMAND "${CMAKE_SOURCE_DIR}/Tools/mac-codesign.sh"
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../../../Tools/mac-codesign.sh"
"${MACOS_CODE_SIGNING_IDENTITY}"
"$<TARGET_BUNDLE_DIR:MacUpdater>"
)

8
Source/Core/VideoBackends/D3DCommon/CMakeLists.txt
View File

@ -16,11 +16,11 @@ PUBLIC
target_include_directories(videod3dcommon
SYSTEM PUBLIC
${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/Public
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Externals/glslang/glslang/Public
SYSTEM PRIVATE
${CMAKE_SOURCE_DIR}/Externals/glslang/StandAlone
${CMAKE_SOURCE_DIR}/Externals/glslang/SPIRV
${CMAKE_SOURCE_DIR}/Externals/glslang
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Externals/glslang/StandAlone
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Externals/glslang/SPIRV
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Externals/glslang
)
if(MSVC)

6
Source/Core/VideoBackends/Vulkan/CMakeLists.txt
View File

@ -58,9 +58,9 @@ endif()
# Only include the Vulkan headers when building the Vulkan backend
target_include_directories(videovulkan
PRIVATE
${CMAKE_SOURCE_DIR}/Externals/Vulkan-Headers/include
${CMAKE_SOURCE_DIR}/Externals/VulkanMemoryAllocator/include
${CMAKE_SOURCE_DIR}/Externals/libadrenotools/include
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Externals/Vulkan-Headers/include
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Externals/VulkanMemoryAllocator/include
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Externals/libadrenotools/include
)
if(MSVC)

8
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -263,11 +263,11 @@ endif()
# Silence warnings on glslang by flagging it as a system include
target_include_directories(videocommon
SYSTEM PUBLIC
${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/Public
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/glslang/glslang/Public
SYSTEM PRIVATE
${CMAKE_SOURCE_DIR}/Externals/glslang/StandAlone
${CMAKE_SOURCE_DIR}/Externals/glslang/SPIRV
${CMAKE_SOURCE_DIR}/Externals/glslang
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/glslang/StandAlone
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/glslang/SPIRV
${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/glslang
)
if(MSVC)

2
Source/UnitTests/CMakeLists.txt
View File

@ -10,7 +10,7 @@ target_link_libraries(tests PRIVATE fmt::fmt gtest::gtest core uicommon)
add_test(NAME tests COMMAND tests)
add_custom_command(TARGET tests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../../Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
)
add_dependencies(unittests tests)