summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/platform_macosx_iOS.GNU
diff options
context:
space:
mode:
authorChip Jones <jonesc@objectcomputing.com>2020-02-05 16:13:41 -0600
committerChip Jones <jonesc@objectcomputing.com>2020-02-05 16:13:41 -0600
commitb40e6033e033d10b1f59b7627467ed9f12ed5970 (patch)
tree13a7316c0494b4e7e534bf3e59e326f7d661c6ef /ACE/include/makeinclude/platform_macosx_iOS.GNU
parent87351e3ca860d234eb9206c006afa4726bc7335e (diff)
downloadATCD-b40e6033e033d10b1f59b7627467ed9f12ed5970.tar.gz
Use single config file for iOS builds. Update build flags for iOS hardware.
Diffstat (limited to 'ACE/include/makeinclude/platform_macosx_iOS.GNU')
-rw-r--r--ACE/include/makeinclude/platform_macosx_iOS.GNU10
1 files changed, 8 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_macosx_iOS.GNU b/ACE/include/makeinclude/platform_macosx_iOS.GNU
index a9ef1870253..3693e7a46b9 100644
--- a/ACE/include/makeinclude/platform_macosx_iOS.GNU
+++ b/ACE/include/makeinclude/platform_macosx_iOS.GNU
@@ -9,13 +9,17 @@ else
XCODE:=/Applications/Xcode.app
endif
+ifndef IPHONE_TARGET
+ $(error Please set IPHONE_TARGET to SIMULATOR or HARDWARE)
+endif
+
ifeq ($(IPHONE_TARGET), SIMULATOR)
CROSS-COMPILE=1
IPHONE_PLATFORM:=$(XCODE)/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer
IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneSimulator${IPHONE_VERSION}.sdk
IPHONE_HARDWARE_ARCHITECTURE=x86_64
-# June 2017 release, iphone 6s and later
+# June 2017 release, iPhone 6s and later
CFLAGS += -miphoneos-version-min=12.0
CCFLAGS += -miphoneos-version-min=12.0
LDFLAGS += -miphoneos-version-min=12.0
@@ -25,7 +29,9 @@ ifeq ($(IPHONE_TARGET), HARDWARE)
CROSS-COMPILE=1
IPHONE_PLATFORM:=$(XCODE)/Contents/Developer/Platforms/iPhoneOS.platform/Developer
IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneOS${IPHONE_VERSION}.sdk
- IPHONE_HARDWARE_ARCHITECTURE=armv7
+# arm64 iPhone 6 and later
+ IPHONE_HARDWARE_ARCHITECTURE=arm64
+
ifeq ($(iphone_codesign),1)
CODESIGN_ALLOCATE:=$(IPHONE_PLATFORM)/usr/bin/codesign_allocate
POSTLINK=; codesign -f -s "iPhone Developer" $(BIN)