Retropex/dolphin
1
0
Fork 0
mirror of https://github.com/Retropex/dolphin.git synced 2025-05-12 11:20:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated CMakeList.txt and BuildMacOSUniversalBinary.py to target 10.15.0

Browse Source 
Added OS check to Source/Core/DolphinQt/CMakeLists.txt so correct version
of Qt is used based off OS (Qt5 for Linux and QT6 or MacOS)
This commit is contained in:
GumbyXGames 2022-10-16 19:28:26 -04:00
parent 7532f5b3ec
commit 777af16f6c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildMacOSUniversalBinary.py
View File

@ -64,7 +64,7 @@ DEFAULT_CONFIG = {
# Minimum macOS version for each architecture slice # Minimum macOS version for each architecture slice
"arm64_mac_os_deployment_target": "11.0.0", "arm64_mac_os_deployment_target": "11.0.0",
"x86_64_mac_os_deployment_target": "10.14.0", "x86_64_mac_os_deployment_target": "10.15.0",
# CMake Generator to use for building # CMake Generator to use for building
"generator": "Unix Makefiles", "generator": "Unix Makefiles",

2
CMakeLists.txt
View File

@ -16,7 +16,7 @@ endif()
# Minimum OS X version. # Minimum OS X version.
# This is inserted into the Info.plist as well. # This is inserted into the Info.plist as well.
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14.0" CACHE STRING "") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15.0" CACHE STRING "")
set(CMAKE_USER_MAKE_RULES_OVERRIDE "CMake/FlagsOverride.cmake") set(CMAKE_USER_MAKE_RULES_OVERRIDE "CMake/FlagsOverride.cmake")

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

@ -17,7 +17,11 @@ set(CMAKE_AUTOMOC ON)
# When Qt5 and Qt6 are given in same NAMES entry, only Qt5 is ever found. # When Qt5 and Qt6 are given in same NAMES entry, only Qt5 is ever found.
# find_package(QT NAMES Qt6 COMPONENTS Core Gui Widgets) # find_package(QT NAMES Qt6 COMPONENTS Core Gui Widgets)
# if(NOT QT_DIR) # if(NOT QT_DIR)
find_package(QT NAMES Qt5 COMPONENTS Core Gui Widgets) if (UNIX AND NOT APPLE)
find_package(QT NAMES Qt5 COMPONENTS Core Gui Widgets)
else()
find_package(QT NAMES Qt6 COMPONENTS Core Gui Widgets)
endif()
# endif() # endif()
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets)
message(STATUS "Found Qt version ${QT_VERSION}") message(STATUS "Found Qt version ${QT_VERSION}")
@ -663,12 +667,12 @@ if(APPLE)
add_custom_command(TARGET dolphin-emu add_custom_command(TARGET dolphin-emu
POST_BUILD COMMAND POST_BUILD COMMAND
/usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu$<$<CONFIG:Debug>:Debug>.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Dolphin.app" || true) /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu$<$<CONFIG:Debug>:Debug>.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Dolphin.app" || true)
# Code sign builds for build systems that do have release/debug variants (Xcode) # Code sign builds for build systems that do have release/debug variants (Xcode)
add_custom_command(TARGET dolphin-emu add_custom_command(TARGET dolphin-emu
POST_BUILD COMMAND POST_BUILD COMMAND
/usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmuDebug.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Dolphin.app" || true) /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmuDebug.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Dolphin.app" || true)
add_custom_command(TARGET dolphin-emu add_custom_command(TARGET dolphin-emu
POST_BUILD COMMAND POST_BUILD COMMAND
/usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Dolphin.app" || true) /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options=runtime --entitlements "${CMAKE_SOURCE_DIR}/Source/Core/DolphinQt/DolphinEmu.entitlements" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Dolphin.app" || true)