diff options
author | Alex Zolotarev <deathbaba@gmail.com> | 2012-09-19 14:23:21 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:43:23 +0300 |
commit | 67ade4cb49e4f5380e36dfb16ab93358556a3b4a (patch) | |
tree | 91b3b6a65ef272470a05ca51753700cf30c52dc6 /tools/mkspecs | |
parent | 1b8258729ccbdfdd3a584c1ed9b8f278d0c634bf (diff) |
[ios] - Added new Xcode support
- Speed up compilation in Release and Debug (only one arch armv7 is built)
- Switched to clang by default to publish release
- Removed iPhone 3G support (armv6 arch and iOS < 4.3)
Diffstat (limited to 'tools/mkspecs')
-rw-r--r-- | tools/mkspecs/iphonedevice-clang/qmake.conf | 19 | ||||
-rw-r--r-- | tools/mkspecs/iphonedevice-llvm/qmake.conf | 19 | ||||
-rw-r--r-- | tools/mkspecs/iphonesimulator-clang/qmake.conf | 6 | ||||
-rw-r--r-- | tools/mkspecs/iphonesimulator-llvm/qmake.conf | 6 |
4 files changed, 28 insertions, 22 deletions
diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf index 30095cbfeb..2c1e9c25dd 100644 --- a/tools/mkspecs/iphonedevice-clang/qmake.conf +++ b/tools/mkspecs/iphonedevice-clang/qmake.conf @@ -6,16 +6,19 @@ # to include /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin # where gcc an all tools are actually resides -IPHONE_SDK_PATH = $$(SDK_ROOT) +IPHONE_SDK_PATH = $$(SDK_ROOT) isEmpty( IPHONE_SDK_PATH ) : error(Please set SDK_ROOT environment variable) +BUILD_ARCH = $$(BUILD_ARCHITECTURE) +isEmpty( BUILD_ARCH ) : error(Please check that BUILD_ARCHITECTURE environment variable is set) + MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += hide_symbols warn_on dwarf2 app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_CC = clang -arch armv6 -arch armv7 -QMAKE_CXX = clang++ -arch armv6 -arch armv7 +QMAKE_CC = clang -arch $$BUILD_ARCH +QMAKE_CXX = clang++ -arch $$BUILD_ARCH QMAKE_RESOURCE = @@ -64,12 +67,12 @@ QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH #QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/ -QMAKE_CFLAGS += -fmessage-length=0 -QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 +QMAKE_CFLAGS += -fmessage-length=0 -mno-thumb +QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.3 QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O3 -funroll-loops +QMAKE_CFLAGS_RELEASE += -O3 -funroll-loops -DNS_BLOCK_ASSERTIONS=1 QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += QMAKE_CFLAGS_STATIC_LIB += @@ -106,8 +109,8 @@ QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC -QMAKE_LFLAGS += -miphoneos-version-min=4.0 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH" -QMAKE_LFLAGS_RELEASE += +QMAKE_LFLAGS += -stdlib=libstdc++ -miphoneos-version-min=4.3 -headerpad_max_install_names -Xlinker "-syslibroot $$IPHONE_SDK_PATH" +QMAKE_LFLAGS_RELEASE += -O3 QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib diff --git a/tools/mkspecs/iphonedevice-llvm/qmake.conf b/tools/mkspecs/iphonedevice-llvm/qmake.conf index 02a2667554..d30b4bd666 100644 --- a/tools/mkspecs/iphonedevice-llvm/qmake.conf +++ b/tools/mkspecs/iphonedevice-llvm/qmake.conf @@ -9,15 +9,18 @@ IPHONE_SDK_PATH = $$(SDK_ROOT) isEmpty( IPHONE_SDK_PATH ) : error(Please set SDK_ROOT environment variable) +BUILD_ARCH = $$(BUILD_ARCHITECTURE) +isEmpty( BUILD_ARCH ) : error(Please check that BUILD_ARCHITECTURE environment variable is set) + MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += hide_symbols warn_on dwarf2 app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_CC = $$IPHONE_SDK_PATH/../../usr/bin/llvm-gcc -arch armv6 -mno-thumb -arch armv7 -mthumb -QMAKE_CXX = $$IPHONE_SDK_PATH/../../usr/bin/llvm-g++ -arch armv6 -mno-thumb -arch armv7 -mthumb +QMAKE_CC = $$IPHONE_SDK_PATH/../../usr/bin/llvm-gcc -arch $$BUILD_ARCH +QMAKE_CXX = $$IPHONE_SDK_PATH/../../usr/bin/llvm-g++ -arch $$BUILD_ARCH -QMAKE_RESOURCE = +QMAKE_RESOURCE = QMAKE_EXTENSION_SHLIB = dylib @@ -64,12 +67,12 @@ QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH #QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/ -QMAKE_CFLAGS += -fmessage-length=0 -QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip +QMAKE_CFLAGS += -fmessage-length=0 -mno-thumb +QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.3 QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O3 -funroll-loops +QMAKE_CFLAGS_RELEASE += -O3 -flto -funroll-loops -DNS_BLOCK_ASSERTIONS=1 QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += QMAKE_CFLAGS_STATIC_LIB += @@ -106,8 +109,8 @@ QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC -QMAKE_LFLAGS += -headerpad_max_install_names -stdlib=libc++ -QMAKE_LFLAGS_RELEASE += +QMAKE_LFLAGS += -stdlib=libstdc++ -miphoneos-version-min=4.3 -headerpad_max_install_names +QMAKE_LFLAGS_RELEASE += -O3 -flto QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += QMAKE_LFLAGS_SHLIB += -single_module -dynamiclib diff --git a/tools/mkspecs/iphonesimulator-clang/qmake.conf b/tools/mkspecs/iphonesimulator-clang/qmake.conf index 80b5a4c0b1..d4b24466e9 100644 --- a/tools/mkspecs/iphonesimulator-clang/qmake.conf +++ b/tools/mkspecs/iphonesimulator-clang/qmake.conf @@ -58,9 +58,9 @@ QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a QMAKE_COMPILER_DEFINES += -DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40000 -QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks -QMAKE_CFLAGS += -pipe -mmacosx-version-min=10.6 +DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40300 +QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks +QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w diff --git a/tools/mkspecs/iphonesimulator-llvm/qmake.conf b/tools/mkspecs/iphonesimulator-llvm/qmake.conf index c8487264b1..84b8c5135a 100644 --- a/tools/mkspecs/iphonesimulator-llvm/qmake.conf +++ b/tools/mkspecs/iphonesimulator-llvm/qmake.conf @@ -58,9 +58,9 @@ QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a QMAKE_COMPILER_DEFINES += -DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40000 -QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks -QMAKE_CFLAGS += -pipe -mmacosx-version-min=10.6 +DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40300 +QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks +QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w |