From 8d96af9873a0a0c5ce76614f92be90d9fd9da34c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Thu, 25 Jun 2020 11:49:29 -0700 Subject: [PATCH] Updated min iOS version to 9. --- include/bx/macros.h | 8 +++----- scripts/toolchain.lua | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/bx/macros.h b/include/bx/macros.h index 169b7bd..cfdf654 100644 --- a/include/bx/macros.h +++ b/include/bx/macros.h @@ -77,11 +77,9 @@ # define BX_NO_VTABLE # define BX_PRINTF_ARGS(_format, _args) __attribute__( (format(__printf__, _format, _args) ) ) -# if BX_CLANG_HAS_FEATURE(cxx_thread_local) -# define BX_THREAD_LOCAL __thread -# endif // BX_COMPILER_CLANG - -# if (!BX_PLATFORM_OSX && (BX_COMPILER_GCC >= 40200)) || (BX_COMPILER_GCC >= 40500) +# if BX_CLANG_HAS_FEATURE(cxx_thread_local) \ + || (!BX_PLATFORM_OSX && (BX_COMPILER_GCC >= 40200) ) \ + || (BX_COMPILER_GCC >= 40500) # define BX_THREAD_LOCAL __thread # endif // BX_COMPILER_GCC diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 8f9abff..086f30a 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -1058,14 +1058,14 @@ function toolchain(_buildDir, _libDir) configuration { "ios-arm*" } linkoptions { - "-miphoneos-version-min=7.0", + "-miphoneos-version-min=9.0", "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk", "-L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk/usr/lib/system", "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk/System/Library/Frameworks", "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks", } buildoptions { - "-miphoneos-version-min=7.0", + "-miphoneos-version-min=9.0", "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" ..iosPlatform .. ".sdk", "-fembed-bitcode", } @@ -1075,7 +1075,7 @@ function toolchain(_buildDir, _libDir) objdir (path.join(_buildDir, "ios-simulator/obj")) libdirs { path.join(_libDir, "lib/ios-simulator") } linkoptions { - "-mios-simulator-version-min=7.0", + "-mios-simulator-version-min=9.0", "-arch i386", "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk", "-L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/usr/lib/system", @@ -1083,7 +1083,7 @@ function toolchain(_buildDir, _libDir) "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks", } buildoptions { - "-mios-simulator-version-min=7.0", + "-mios-simulator-version-min=9.0", "-arch i386", "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk", } @@ -1093,7 +1093,7 @@ function toolchain(_buildDir, _libDir) objdir (path.join(_buildDir, "ios-simulator64/obj")) libdirs { path.join(_libDir, "lib/ios-simulator64") } linkoptions { - "-mios-simulator-version-min=7.0", + "-mios-simulator-version-min=9.0", "-arch x86_64", "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk", "-L/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/usr/lib/system", @@ -1101,7 +1101,7 @@ function toolchain(_buildDir, _libDir) "-F/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk/System/Library/PrivateFrameworks", } buildoptions { - "-mios-simulator-version-min=7.0", + "-mios-simulator-version-min=9.0", "-arch x86_64", "--sysroot=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" ..iosPlatform .. ".sdk", }