piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

MacUpdater: Always use the same signing identity as the DolphinQt bundle

Browse Source
This commit is contained in:
OatmealDome 2024-07-30 21:46:06 -04:00
parent bb5326adf4
commit 8499b43501
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildMacOSUniversalBinary.py
View File

@ -317,8 +317,6 @@ def build(config):
+ config[arch+"_mac_os_deployment_target"], + config[arch+"_mac_os_deployment_target"],
"-DMACOS_CODE_SIGNING_IDENTITY=" "-DMACOS_CODE_SIGNING_IDENTITY="
+ config["codesign_identity"], + config["codesign_identity"],
"-DMACOS_CODE_SIGNING_IDENTITY_UPDATER="
+ config["codesign_identity"],
'-DMACOS_CODE_SIGNING="ON"', '-DMACOS_CODE_SIGNING="ON"',
"-DSTEAM=" "-DSTEAM="
+ python_to_cmake_bool(config["steam"]), + python_to_cmake_bool(config["steam"]),

1
CMakeLists.txt
View File

@ -138,7 +138,6 @@ if(APPLE)
option(MACOS_CODE_SIGNING "Enable codesigning" ON) option(MACOS_CODE_SIGNING "Enable codesigning" ON)
option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON) option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON)
set(MACOS_CODE_SIGNING_IDENTITY "-" CACHE STRING "The identity used for codesigning.") set(MACOS_CODE_SIGNING_IDENTITY "-" CACHE STRING "The identity used for codesigning.")
set(MACOS_CODE_SIGNING_IDENTITY_UPDATER "-" CACHE STRING "The identity used for codesigning, for the updater.")
endif() endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

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

@ -54,10 +54,6 @@ foreach(sb ${STORYBOARDS})
endforeach() endforeach()
if(MACOS_CODE_SIGNING) if(MACOS_CODE_SIGNING)
if (MACOS_CODE_SIGNING_IDENTITY_UPDATER STREQUAL "")
set(MACOS_CODE_SIGNING_IDENTITY_UPDATER "${MACOS_CODE_SIGNING_IDENTITY}")
endif()
add_custom_command(TARGET MacUpdater POST_BUILD add_custom_command(TARGET MacUpdater POST_BUILD
COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY_UPDATER}" --deep --options runtime $<TARGET_BUNDLE_DIR:MacUpdater>) COMMAND /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY}" --deep --options runtime $<TARGET_BUNDLE_DIR:MacUpdater>)
endif() endif()