diff options
| author | Chip Jones <jonesc@objectcomputing.com> | 2020-02-04 14:14:09 -0600 |
|---|---|---|
| committer | Chip Jones <jonesc@objectcomputing.com> | 2020-02-05 09:39:28 -0600 |
| commit | 848c22e162de492caa4c1c9a3ce39a4cff0849b8 (patch) | |
| tree | 3630d5284893b575b5b0905ee47b43236de9c3ae | |
| parent | 816fca070860bbbb003aa59bc2acc69f98000cc0 (diff) | |
| download | ATCD-848c22e162de492caa4c1c9a3ce39a4cff0849b8.tar.gz | |
Configuration changes for iOS builds.
| -rw-r--r-- | ACE/ace/config-macosx-iOS-hardware.h | 2 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-iOS-simulator.h | 3 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-leopard.h | 6 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_iOS.GNU | 16 |
4 files changed, 17 insertions, 10 deletions
diff --git a/ACE/ace/config-macosx-iOS-hardware.h b/ACE/ace/config-macosx-iOS-hardware.h index 0d2cc900b85..bbbd137af5b 100644 --- a/ACE/ace/config-macosx-iOS-hardware.h +++ b/ACE/ace/config-macosx-iOS-hardware.h @@ -4,7 +4,7 @@ #define ACE_HAS_IPHONE #define ACE_SIZEOF_LONG_DOUBLE 8 -#include "ace/config-macosx-mavericks.h" +#include "ace/config-macosx-mojave.h" #ifdef ACE_HAS_SYSV_IPC #undef ACE_HAS_SYSV_IPC diff --git a/ACE/ace/config-macosx-iOS-simulator.h b/ACE/ace/config-macosx-iOS-simulator.h index 483dad5530c..603d160cfbd 100644 --- a/ACE/ace/config-macosx-iOS-simulator.h +++ b/ACE/ace/config-macosx-iOS-simulator.h @@ -2,7 +2,8 @@ #define ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H #define ACE_HAS_IPHONE -#include "ace/config-macosx-mavericks.h" + +#include "ace/config-macosx-mojave.h" #endif /* ACE_CONFIG_MACOSX_IPHONE_SIMULATOR_H */ diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index 4e53e3bcada..237a17b41a1 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -204,11 +204,17 @@ #endif #define ACE_LACKS_CONDATTR_SETCLOCK + +#ifndef ACE_HAS_IPHONE #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200 #define ACE_LACKS_CLOCKID_T #define ACE_LACKS_CLOCK_MONOTONIC #define ACE_LACKS_CLOCK_REALTIME #endif +#else +#define ACE_LACKS_SYSTEM +#endif + // dlcompat package (not part of base Darwin) is needed for dlopen(). // You may download directly from sourceforge and install or use fink // Fink installer puts libraries in /sw/lib and headers in /sw/include diff --git a/ACE/include/makeinclude/platform_macosx_iOS.GNU b/ACE/include/makeinclude/platform_macosx_iOS.GNU index 4e554174a6f..2ff6e44d477 100644 --- a/ACE/include/makeinclude/platform_macosx_iOS.GNU +++ b/ACE/include/makeinclude/platform_macosx_iOS.GNU @@ -10,15 +10,15 @@ else 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=i386 + IPHONE_HARDWARE_ARCHITECTURE=x86_64 - # crt1.10.7.o is missing under MacOSX 10.7, fallback to 10.6 - # until apple provides the missing crt1.10.7.o - CFLAGS += -mmacosx-version-min=10.6 - CCFLAGS += -mmacosx-version-min=10.6 - LDFLAGS += -mmacosx-version-min=10.6 +# 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 endif ifeq ($(IPHONE_TARGET), HARDWARE) @@ -35,8 +35,8 @@ endif CC:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang CXX:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -AR:=$(IPHONE_PLATFORM)/usr/bin/ar -RANLIB:=$(IPHONE_PLATFORM)/usr/bin/ranlib +AR:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar +RANLIB:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib DLD = $(CXX) LD = $(CXX) CFLAGS += -arch $(IPHONE_HARDWARE_ARCHITECTURE) -isysroot $(IPHONE_SDK) |