diff options
Diffstat (limited to 'cmake/scripts/osx')
| -rw-r--r-- | cmake/scripts/osx/ArchSetup.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/osx/Install.cmake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake index 7d8f58b..f723aa2 100644 --- a/cmake/scripts/osx/ArchSetup.cmake +++ b/cmake/scripts/osx/ArchSetup.cmake | |||
| @@ -23,6 +23,8 @@ else() | |||
| 23 | endif() | 23 | endif() |
| 24 | endif() | 24 | endif() |
| 25 | 25 | ||
| 26 | set(CMAKE_OSX_ARCHITECTURES ${CPU}) | ||
| 27 | |||
| 26 | # Additional SYSTEM_DEFINES | 28 | # Additional SYSTEM_DEFINES |
| 27 | list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_OSX_NETWORK -DHAS_SDL -DHAS_ZEROCONF) | 29 | list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_OSX_NETWORK -DHAS_SDL -DHAS_ZEROCONF) |
| 28 | 30 | ||
diff --git a/cmake/scripts/osx/Install.cmake b/cmake/scripts/osx/Install.cmake index 629bc09..2ae41f5 100644 --- a/cmake/scripts/osx/Install.cmake +++ b/cmake/scripts/osx/Install.cmake | |||
| @@ -52,6 +52,7 @@ add_custom_target(dmg | |||
| 52 | "DEV_TEAM=${DEV_TEAM}" | 52 | "DEV_TEAM=${DEV_TEAM}" |
| 53 | "EXPANDED_CODE_SIGN_IDENTITY_NAME=${CODE_SIGN_IDENTITY}" | 53 | "EXPANDED_CODE_SIGN_IDENTITY_NAME=${CODE_SIGN_IDENTITY}" |
| 54 | "PLATFORM_NAME=${PLATFORM}" | 54 | "PLATFORM_NAME=${PLATFORM}" |
| 55 | "XCODE_BUILDTYPE=${CMAKE_CFG_INTDIR}" | ||
| 55 | ./mkdmg-osx.sh ${CORE_BUILD_CONFIG_LOWERCASED} | 56 | ./mkdmg-osx.sh ${CORE_BUILD_CONFIG_LOWERCASED} |
| 56 | WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/darwin/packaging/osx) | 57 | WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/darwin/packaging/osx) |
| 57 | set_target_properties(dmg PROPERTIES FOLDER "Build Utilities") | 58 | set_target_properties(dmg PROPERTIES FOLDER "Build Utilities") |
