diff options
| author | Chip Jones <jonesc@objectcomputing.com> | 2020-02-05 16:13:41 -0600 |
|---|---|---|
| committer | Chip Jones <jonesc@objectcomputing.com> | 2020-02-05 16:13:41 -0600 |
| commit | b40e6033e033d10b1f59b7627467ed9f12ed5970 (patch) | |
| tree | 13a7316c0494b4e7e534bf3e59e326f7d661c6ef | |
| parent | 87351e3ca860d234eb9206c006afa4726bc7335e (diff) | |
| download | ATCD-b40e6033e033d10b1f59b7627467ed9f12ed5970.tar.gz | |
Use single config file for iOS builds. Update build flags for iOS hardware.
| -rw-r--r-- | ACE/ace/config-macosx-iOS-hardware.h | 14 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-iOS-simulator.h | 9 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-iOS.h | 13 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_iOS.GNU | 10 |
4 files changed, 21 insertions, 25 deletions
diff --git a/ACE/ace/config-macosx-iOS-hardware.h b/ACE/ace/config-macosx-iOS-hardware.h deleted file mode 100644 index c82bd5ec593..00000000000 --- a/ACE/ace/config-macosx-iOS-hardware.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H -#define ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H - -#define ACE_HAS_IPHONE -#define ACE_SIZEOF_LONG_DOUBLE 8 -#define ACE_LACKS_SYSTEM - -#include "ace/config-macosx-mojave.h" - -#ifdef ACE_HAS_SYSV_IPC -#undef ACE_HAS_SYSV_IPC -#endif - -#endif /* ACE_CONFIG_MACOSX_IPHONE_HARDWARE_H */ diff --git a/ACE/ace/config-macosx-iOS-simulator.h b/ACE/ace/config-macosx-iOS-simulator.h deleted file mode 100644 index 7503e497899..00000000000 --- a/ACE/ace/config-macosx-iOS-simulator.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H -#define ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H - -#define ACE_HAS_IPHONE -#define ACE_LACKS_SYSTEM - -#include "ace/config-macosx-mojave.h" - -#endif /* ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H */ diff --git a/ACE/ace/config-macosx-iOS.h b/ACE/ace/config-macosx-iOS.h new file mode 100644 index 00000000000..4fcd1bd406c --- /dev/null +++ b/ACE/ace/config-macosx-iOS.h @@ -0,0 +1,13 @@ +#ifndef ACE_CONFIG_MACOSX_IPHONE_H +#define ACE_CONFIG_MACOSX_IPHONE_H + +#define ACE_HAS_IPHONE +#define ACE_LACKS_SYSTEM + +#include "ace/config-macosx-mojave.h" + +#ifdef ACE_HAS_SYSV_IPC +#undef ACE_HAS_SYSV_IPC +#endif + +#endif /* ACE_CONFIG_MACOSX_IPHONE_H */ 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) |