mirror of
https://github.com/izzy2lost/Ghostship.git
synced 2026-06-19 01:17:03 -07:00
Some small cmake fixes
This commit is contained in:
KiritoDv
+15
-9
@@ -94,13 +94,13 @@ set(CPP "${CMAKE_C_COMPILER}" "-E" "-P" "-Wno-trigraphs" "-x" "c")
|
||||
endif()
|
||||
|
||||
if(IOS)
|
||||
set(PLATFORM "OS64")
|
||||
include(cmake/ios.toolchain.cmake)
|
||||
add_compile_definitions(
|
||||
PLATFORM_IOS=1
|
||||
)
|
||||
set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "YOUR_TEAM_ID")
|
||||
set(PROJECT_ID "dev.net64.game")
|
||||
set(PLATFORM "OS64")
|
||||
include(cmake/ios.toolchain.cmake)
|
||||
add_compile_definitions(
|
||||
PLATFORM_IOS=1
|
||||
)
|
||||
set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "YOUR_TEAM_ID")
|
||||
set(PROJECT_ID "${BUNDLE_ID}")
|
||||
endif()
|
||||
|
||||
################################################################################
|
||||
@@ -243,7 +243,7 @@ foreach(source IN LISTS ALL_FILES)
|
||||
endforeach()
|
||||
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
|
||||
set(IOS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/ios)
|
||||
set(IOS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ios)
|
||||
|
||||
set(STORYBOARD_FILE ${IOS_DIR}/Launch.storyboard)
|
||||
set(IMAGE_FILES ${IOS_DIR}/PoweredBy.png)
|
||||
@@ -252,7 +252,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "iOS")
|
||||
list(APPEND ALL_FILES ${STORYBOARD_FILE} ${IMAGE_FILES} ${ICON_FILES})
|
||||
|
||||
add_executable(${PROJECT_NAME} ${ALL_FILES})
|
||||
set_xcode_property(${PROJECT_NAME} PRODUCT_BUNDLE_IDENTIFIER ${PROJECT_ID} All)
|
||||
set_target_properties(
|
||||
${PROJECT_NAME}
|
||||
PROPERTIES
|
||||
@@ -307,6 +306,13 @@ target_include_directories(${PROJECT_NAME} PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include/libultraship
|
||||
)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
|
||||
get_property(IOS_TOOLCHAIN_FILE GLOBAL PROPERTY IOS_TOOLCHAIN_FILE)
|
||||
include(${IOS_TOOLCHAIN_FILE})
|
||||
set(BUNDLE_ID "dev.hm64.soh")
|
||||
set(SIGN_LIBRARY ON)
|
||||
endif()
|
||||
|
||||
if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||
target_compile_definitions(${PROJECT_NAME} PRIVATE
|
||||
"$<$<CONFIG:Debug>:"
|
||||
|
||||
+87
-32
@@ -67,10 +67,14 @@
|
||||
# TVOSCOMBINED = Build for arm64 x86_64 tvOS + tvOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step)
|
||||
# SIMULATOR_TVOS = Build for x86_64 tvOS Simulator.
|
||||
# SIMULATORARM64_TVOS = Build for arm64 tvOS Simulator.
|
||||
# VISIONOSCOMBINED = Build for arm64 visionOS + visionOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step)
|
||||
# VISIONOS = Build for arm64 visionOS.
|
||||
# SIMULATOR_VISIONOS = Build for arm64 visionOS Simulator.
|
||||
# WATCHOS = Build for armv7k arm64_32 for watchOS.
|
||||
# WATCHOSCOMBINED = Build for armv7k arm64_32 x86_64 watchOS + watchOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step)
|
||||
# SIMULATOR_WATCHOS = Build for x86_64 for watchOS Simulator.
|
||||
# SIMULATORARM64_WATCHOS = Build for arm64 for watchOS Simulator.
|
||||
# SIMULATOR_WATCHOSCOMBINED = Build for arm64 x86_64 for watchOS Simulator. Combined into FAT STATIC lib (supported on 3.14+ of CMakewith "-G Xcode" argument ONLY)
|
||||
# MAC = Build for x86_64 macOS.
|
||||
# MAC_ARM64 = Build for Apple Silicon macOS.
|
||||
# MAC_UNIVERSAL = Combined build for x86_64 and Apple Silicon on macOS.
|
||||
@@ -78,6 +82,7 @@
|
||||
# Note: The build argument "MACOSX_DEPLOYMENT_TARGET" can be used to control min-version of macOS
|
||||
# MAC_CATALYST_ARM64 = Build for Apple Silicon macOS with Catalyst support (iOS toolchain on macOS).
|
||||
# Note: The build argument "MACOSX_DEPLOYMENT_TARGET" can be used to control min-version of macOS
|
||||
# MAC_CATALYST_UNIVERSAL = Combined build for x86_64 and Apple Silicon on Catalyst.
|
||||
#
|
||||
# CMAKE_OSX_SYSROOT: Path to the SDK to use. By default this is
|
||||
# automatically determined from PLATFORM and xcodebuild, but
|
||||
@@ -120,6 +125,7 @@
|
||||
# MAC_UNIVERSAL = x86_64 arm64
|
||||
# MAC_CATALYST = x86_64
|
||||
# MAC_CATALYST_ARM64 = arm64
|
||||
# MAC_CATALYST_UNIVERSAL = x86_64 arm64
|
||||
#
|
||||
# NOTE: When manually specifying ARCHS, put a semi-colon between the entries. E.g., -DARCHS="armv7;arm64"
|
||||
#
|
||||
@@ -151,7 +157,8 @@
|
||||
cmake_minimum_required(VERSION 3.8.0)
|
||||
|
||||
# CMake invokes the toolchain file twice during the first build, but only once during subsequent rebuilds.
|
||||
if(DEFINED ENV{_IOS_TOOLCHAIN_HAS_RUN})
|
||||
# NOTE: To improve single-library build-times, provide the flag "OS_SINGLE_BUILD" as a build argument.
|
||||
if(DEFINED OS_SINGLE_BUILD AND DEFINED ENV{_IOS_TOOLCHAIN_HAS_RUN})
|
||||
return()
|
||||
endif()
|
||||
set(ENV{_IOS_TOOLCHAIN_HAS_RUN} true)
|
||||
@@ -160,10 +167,10 @@ set(ENV{_IOS_TOOLCHAIN_HAS_RUN} true)
|
||||
list(APPEND _supported_platforms
|
||||
"OS" "OS64" "OS64COMBINED" "SIMULATOR" "SIMULATOR64" "SIMULATORARM64" "SIMULATOR64COMBINED"
|
||||
"TVOS" "TVOSCOMBINED" "SIMULATOR_TVOS" "SIMULATORARM64_TVOS"
|
||||
"WATCHOS" "WATCHOSCOMBINED" "SIMULATOR_WATCHOS" "SIMULATORARM64_WATCHOS"
|
||||
"WATCHOS" "WATCHOSCOMBINED" "SIMULATOR_WATCHOS" "SIMULATORARM64_WATCHOS" "SIMULATOR_WATCHOSCOMBINED"
|
||||
"MAC" "MAC_ARM64" "MAC_UNIVERSAL"
|
||||
"VISIONOS" "SIMULATOR_VISIONOS" "SIMULATOR64_VISIONOS"
|
||||
"MAC_CATALYST" "MAC_CATALYST_ARM64")
|
||||
"VISIONOS" "SIMULATOR_VISIONOS" "VISIONOSCOMBINED"
|
||||
"MAC_CATALYST" "MAC_CATALYST_ARM64" "MAC_CATALYST_UNIVERSAL")
|
||||
|
||||
# Cache what generator is used
|
||||
set(USED_CMAKE_GENERATOR "${CMAKE_GENERATOR}")
|
||||
@@ -227,7 +234,7 @@ if("${contains_PLATFORM}" EQUAL "-1")
|
||||
endif()
|
||||
|
||||
# Check if Apple Silicon is supported
|
||||
if(PLATFORM MATCHES "^(MAC_ARM64)$|^(MAC_CATALYST_ARM64)$|^(MAC_UNIVERSAL)$" AND ${CMAKE_VERSION} VERSION_LESS "3.19.5")
|
||||
if(PLATFORM MATCHES "^(MAC_ARM64)$|^(MAC_CATALYST_ARM64)$|^(MAC_UNIVERSAL)$|^(MAC_CATALYST_UNIVERSAL)$" AND ${CMAKE_VERSION} VERSION_LESS "3.19.5")
|
||||
message(FATAL_ERROR "Apple Silicon builds requires a minimum of CMake 3.19.5")
|
||||
endif()
|
||||
|
||||
@@ -258,12 +265,12 @@ set(NAMED_LANGUAGE_SUPPORT_INT ${NAMED_LANGUAGE_SUPPORT} CACHE BOOL
|
||||
# Specify the minimum version of the deployment target.
|
||||
if(NOT DEFINED DEPLOYMENT_TARGET)
|
||||
if (PLATFORM MATCHES "WATCHOS")
|
||||
# Unless specified, SDK version 4.0 is used by default as minimum target version (watchOS).
|
||||
# Unless specified, SDK version 6.0 is used by default as minimum target version (watchOS).
|
||||
set(DEPLOYMENT_TARGET "6.0")
|
||||
elseif(PLATFORM STREQUAL "MAC")
|
||||
# Unless specified, SDK version 10.13 (High Sierra) is used by default as the minimum target version (macos).
|
||||
# Unless specified, SDK version 11.0 (Big Sur) is used by default as the minimum target version (macOS on x86).
|
||||
set(DEPLOYMENT_TARGET "11.0")
|
||||
elseif(PLATFORM STREQUAL "VISIONOS" OR PLATFORM STREQUAL "SIMULATOR_VISIONOS" OR PLATFORM STREQUAL "SIMULATOR64_VISIONOS")
|
||||
elseif(PLATFORM STREQUAL "VISIONOS" OR PLATFORM STREQUAL "SIMULATOR_VISIONOS" OR PLATFORM STREQUAL "VISIONOSCOMBINED")
|
||||
# Unless specified, SDK version 1.0 is used by default as minimum target version (visionOS).
|
||||
set(DEPLOYMENT_TARGET "1.0")
|
||||
elseif(PLATFORM STREQUAL "MAC_ARM64")
|
||||
@@ -272,11 +279,11 @@ if(NOT DEFINED DEPLOYMENT_TARGET)
|
||||
elseif(PLATFORM STREQUAL "MAC_UNIVERSAL")
|
||||
# Unless specified, SDK version 11.0 (Big Sur) is used by default as minimum target version for universal builds.
|
||||
set(DEPLOYMENT_TARGET "11.0")
|
||||
elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64")
|
||||
# Unless specified, SDK version 13.0 is used by default as the minimum target version (mac catalyst minimum requirement).
|
||||
elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64" OR PLATFORM STREQUAL "MAC_CATALYST_UNIVERSAL")
|
||||
# Unless specified, SDK version 13.1 is used by default as the minimum target version (mac catalyst minimum requirement).
|
||||
set(DEPLOYMENT_TARGET "13.1")
|
||||
else()
|
||||
# Unless specified, SDK version 11.0 is used by default as the minimum target version (iOS, tvOS).
|
||||
# Unless specified, SDK version 13.0 is used by default as the minimum target version (iOS, tvOS).
|
||||
set(DEPLOYMENT_TARGET "13.0")
|
||||
endif()
|
||||
message(STATUS "[DEFAULTS] Using the default min-version since DEPLOYMENT_TARGET not provided!")
|
||||
@@ -310,7 +317,7 @@ if(PLATFORM_INT STREQUAL "OS")
|
||||
set(ARCHS armv7 armv7s arm64)
|
||||
set(APPLE_TARGET_TRIPLE_INT arm-apple-ios${DEPLOYMENT_TARGET})
|
||||
else()
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET})
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET})
|
||||
endif()
|
||||
elseif(PLATFORM_INT STREQUAL "OS64")
|
||||
set(SDK_NAME iphoneos)
|
||||
@@ -412,9 +419,9 @@ elseif (PLATFORM_INT STREQUAL "TVOSCOMBINED")
|
||||
set(ARCHS arm64 x86_64)
|
||||
set(APPLE_TARGET_TRIPLE_INT arm64-x86_64-apple-tvos${DEPLOYMENT_TARGET})
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvos*] "arm64")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvsimulator*] "x86_64")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvsimulator*] "x86_64 arm64")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=appletvos*] "arm64")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=appletvsimulator*] "x86_64")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=appletvsimulator*] "x86_64 arm64")
|
||||
else()
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-tvos${DEPLOYMENT_TARGET})
|
||||
endif()
|
||||
@@ -455,12 +462,12 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
|
||||
if(MODERN_CMAKE)
|
||||
if(NOT ARCHS)
|
||||
if (XCODE_VERSION_INT VERSION_GREATER 10.0)
|
||||
set(ARCHS armv7k arm64_32 i386)
|
||||
set(APPLE_TARGET_TRIPLE_INT arm64_32-i386-apple-watchos${DEPLOYMENT_TARGET})
|
||||
set(ARCHS armv7k arm64_32 x86_64)
|
||||
set(APPLE_TARGET_TRIPLE_INT arm64_32-x86_64-apple-watchos${DEPLOYMENT_TARGET})
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "armv7k arm64_32")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "x86_64")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "armv7k arm64_32")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "x86_64")
|
||||
else()
|
||||
set(ARCHS armv7k i386)
|
||||
set(APPLE_TARGET_TRIPLE_INT arm-i386-apple-watchos${DEPLOYMENT_TARGET})
|
||||
@@ -478,8 +485,13 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
|
||||
elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOS")
|
||||
set(SDK_NAME watchsimulator)
|
||||
if(NOT ARCHS)
|
||||
set(ARCHS i386)
|
||||
set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
|
||||
if (XCODE_VERSION_INT VERSION_GREATER 10.0)
|
||||
set(ARCHS x86_64)
|
||||
set(APPLE_TARGET_TRIPLE_INT x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator)
|
||||
else()
|
||||
set(ARCHS i386)
|
||||
set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
|
||||
endif()
|
||||
else()
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
|
||||
endif()
|
||||
@@ -491,13 +503,30 @@ elseif(PLATFORM_INT STREQUAL "SIMULATORARM64_WATCHOS")
|
||||
else()
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
|
||||
endif()
|
||||
elseif(PLATFORM_INT STREQUAL "SIMULATOR64_VISIONOS")
|
||||
set(SDK_NAME xrsimulator)
|
||||
if(NOT ARCHS)
|
||||
set(ARCHS x86_64)
|
||||
set(APPLE_TARGET_TRIPLE_INT x86_64-apple-xros${DEPLOYMENT_TARGET}-simulator)
|
||||
elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOSCOMBINED")
|
||||
set(SDK_NAME watchsimulator)
|
||||
if(MODERN_CMAKE)
|
||||
if(NOT ARCHS)
|
||||
if (XCODE_VERSION_INT VERSION_GREATER 12.0)
|
||||
set(ARCHS arm64 x86_64)
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "arm64 x86_64")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "arm64 x86_64")
|
||||
set(APPLE_TARGET_TRIPLE_INT arm64_x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator)
|
||||
else()
|
||||
set(ARCHS arm64 i386)
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386")
|
||||
set(APPLE_TARGET_TRIPLE_INT arm64_i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
|
||||
endif()
|
||||
else()
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
|
||||
endif()
|
||||
else()
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-xros${DEPLOYMENT_TARGET}-simulator)
|
||||
message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the SIMULATOR_WATCHOSCOMBINED setting work")
|
||||
endif()
|
||||
elseif(PLATFORM_INT STREQUAL "SIMULATOR_VISIONOS")
|
||||
set(SDK_NAME xrsimulator)
|
||||
@@ -515,6 +544,20 @@ elseif(PLATFORM_INT STREQUAL "VISIONOS")
|
||||
else()
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-xros${DEPLOYMENT_TARGET})
|
||||
endif()
|
||||
elseif(PLATFORM_INT STREQUAL "VISIONOSCOMBINED")
|
||||
set(SDK_NAME xros)
|
||||
if(MODERN_CMAKE)
|
||||
if(NOT ARCHS)
|
||||
set(ARCHS arm64)
|
||||
set(APPLE_TARGET_TRIPLE_INT arm64-apple-xros${DEPLOYMENT_TARGET})
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=xros*] "arm64")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=xrsimulator*] "arm64")
|
||||
else()
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-xros${DEPLOYMENT_TARGET})
|
||||
endif()
|
||||
else()
|
||||
message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the VISIONOSCOMBINED setting work")
|
||||
endif()
|
||||
elseif(PLATFORM_INT STREQUAL "MAC" OR PLATFORM_INT STREQUAL "MAC_CATALYST")
|
||||
set(SDK_NAME macosx)
|
||||
if(NOT ARCHS)
|
||||
@@ -538,12 +581,20 @@ elseif(PLATFORM_INT MATCHES "^(MAC_ARM64)$|^(MAC_CATALYST_ARM64)$")
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}-macabi)
|
||||
endif()
|
||||
elseif(PLATFORM_INT STREQUAL "MAC_UNIVERSAL")
|
||||
set(SDK_NAME macosx)
|
||||
if(NOT ARCHS)
|
||||
set(ARCHS "x86_64;arm64")
|
||||
endif()
|
||||
# For universal builds, don't set target triple - let CMake handle it
|
||||
# string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}")
|
||||
# set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-macosx${DEPLOYMENT_TARGET})
|
||||
elseif(PLATFORM_INT STREQUAL "MAC_CATALYST_UNIVERSAL")
|
||||
set(SDK_NAME macosx)
|
||||
if(NOT ARCHS)
|
||||
set(ARCHS "x86_64;arm64")
|
||||
endif()
|
||||
string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}")
|
||||
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-macosx${DEPLOYMENT_TARGET})
|
||||
set(APPLE_TARGET_TRIPLE_INT apple-ios${DEPLOYMENT_TARGET}-macabi)
|
||||
else()
|
||||
message(FATAL_ERROR "Invalid PLATFORM: ${PLATFORM_INT}")
|
||||
endif()
|
||||
@@ -752,9 +803,12 @@ set(APPLE ON CACHE BOOL "")
|
||||
if(PLATFORM STREQUAL "MAC" OR PLATFORM STREQUAL "MAC_ARM64" OR PLATFORM STREQUAL "MAC_UNIVERSAL")
|
||||
set(IOS OFF CACHE BOOL "")
|
||||
set(MACOS ON CACHE BOOL "")
|
||||
elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64")
|
||||
elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64" OR PLATFORM STREQUAL "MAC_CATALYST_UNIVERSAL")
|
||||
set(IOS ON CACHE BOOL "")
|
||||
set(MACOS ON CACHE BOOL "")
|
||||
elseif(PLATFORM STREQUAL "VISIONOS" OR PLATFORM STREQUAL "SIMULATOR_VISIONOS" OR PLATFORM STREQUAL "VISIONOSCOMBINED")
|
||||
set(IOS OFF CACHE BOOL "")
|
||||
set(VISIONOS ON CACHE BOOL "")
|
||||
else()
|
||||
set(IOS ON CACHE BOOL "")
|
||||
endif()
|
||||
@@ -769,6 +823,7 @@ if (NOT DEFINED CMAKE_MACOSX_BUNDLE)
|
||||
set(CMAKE_MACOSX_BUNDLE YES)
|
||||
endif()
|
||||
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
|
||||
set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED "NO")
|
||||
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
|
||||
set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
|
||||
set(CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES ".tbd" ".so")
|
||||
@@ -937,7 +992,7 @@ else()
|
||||
set(CMAKE_OBJCXX_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_OBJCXX_LINK_FLAGS}" CACHE INTERNAL
|
||||
"Flags used by the compiler for all OBJCXX link types.")
|
||||
endif()
|
||||
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp -arch ${CMAKE_OSX_ARCHITECTURES} ${APPLE_TARGET_TRIPLE_FLAG}" CACHE INTERNAL
|
||||
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp" CACHE INTERNAL
|
||||
"Flags used by the compiler for all ASM build types.")
|
||||
endif()
|
||||
|
||||
@@ -1026,7 +1081,7 @@ set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
|
||||
)
|
||||
|
||||
if(NAMED_LANGUAGE_SUPPORT_INT)
|
||||
list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
|
||||
list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
|
||||
CMAKE_OBJC_FLAGS
|
||||
CMAKE_OBJC_DEBUG
|
||||
CMAKE_OBJC_MINSIZEREL
|
||||
@@ -1064,7 +1119,7 @@ IF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
|
||||
ENDIF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
|
||||
|
||||
# Set up the default search directories for frameworks.
|
||||
if(PLATFORM_INT MATCHES "^MAC_CATALYST")
|
||||
if(PLATFORM_INT MATCHES "^MAC_CATALYST")
|
||||
set(CMAKE_FRAMEWORK_PATH
|
||||
${CMAKE_DEVELOPER_ROOT}/Library/PrivateFrameworks
|
||||
${CMAKE_OSX_SYSROOT_INT}/System/Library/Frameworks
|
||||
@@ -1119,4 +1174,4 @@ macro(find_host_package)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
|
||||
endmacro(find_host_package)
|
||||
endmacro(find_host_package)
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
|
||||
<device id="retina6_12" orientation="landscape" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--View Controller-->
|
||||
<scene sceneID="EHf-IW-A2E">
|
||||
<objects>
|
||||
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
|
||||
<layoutGuides>
|
||||
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
|
||||
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
|
||||
<rect key="frame" x="0.0" y="0.0" width="852" height="393"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="PoweredBy.png" translatesAutoresizingMaskIntoConstraints="NO" id="VeL-6u-rS3">
|
||||
<rect key="frame" x="47" y="44" width="759" height="304"/>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="VeL-6u-rS3" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="C5X-Vg-tvO"/>
|
||||
<constraint firstAttribute="trailing" secondItem="VeL-6u-rS3" secondAttribute="trailing" id="X4i-1U-3JE"/>
|
||||
<constraint firstItem="VeL-6u-rS3" firstAttribute="bottom" secondItem="xb3-aO-Qok" secondAttribute="top" id="dSu-2l-DcF"/>
|
||||
<constraint firstItem="VeL-6u-rS3" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="xKC-uj-bxE"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="51.408450704225352" y="373.28244274809157"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
<image name="PoweredBy.png" width="1920" height="1280"/>
|
||||
</resources>
|
||||
</document>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 168 KiB |
@@ -0,0 +1,54 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string></string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>Icon</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
<key>LSSupportsOpeningDocumentsInPlace</key>
|
||||
<true/>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>UIFileSharingEnabled</key>
|
||||
<true/>
|
||||
<key>UILaunchStoryboardName</key>
|
||||
<string>Launch.storyboard</string>
|
||||
<key>UIStatusBarStyle</key>
|
||||
<string></string>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations~ipad</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
</array>
|
||||
<key>UISupportsDocumentBrowser</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</plist>
|
||||
Reference in New Issue
Block a user