From 6e594a945164d661d0e1336fcdde784ccd41f5b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 1 Nov 2012 13:18:15 +0100 Subject: iOS: Move device/simulator conditionals out of common mkspecs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead we deal with any differenced by setting variables in the top level makespecs, that are used by the common makespec configs. Change-Id: Iae1fb5fef8c95778511ed400008731989b446f3c Reviewed-by: Morten Johan Sørvig --- mkspecs/common/ios/qmake.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'mkspecs/common/ios/qmake.conf') diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf index 7f6a4df544..ee3010f451 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/ios/qmake.conf @@ -9,6 +9,20 @@ # QMAKE_IOSSIMULATOR_SDK_VERSION - set in mkspecs/common/ios/versions.conf # +QMAKE_XCODE_TOOLCHAIN_BIN_PATH = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin + +# iOS build tools +QMAKE_CC = $$QMAKE_XCODE_TOOLCHAIN_BIN_PATH/clang +QMAKE_CXX = $$QMAKE_XCODE_TOOLCHAIN_BIN_PATH/clang++ +QMAKE_FIX_RPATH = $$QMAKE_XCODE_TOOLCHAIN_BIN_PATH/install_name_tool -id +QMAKE_AR = $$QMAKE_XCODE_TOOLCHAIN_BIN_PATH/ar cq +QMAKE_RANLIB = $$QMAKE_XCODE_TOOLCHAIN_BIN_PATH/ranlib -s +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX + +# Check that compiler is valid +!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the clang compiler") + QMAKE_CFLAGS += -isysroot $$QMAKE_IOS_SDK_PATH QMAKE_CXXFLAGS += -isysroot $$QMAKE_IOS_SDK_PATH QMAKE_OBJECTIVE_CFLAGS += -isysroot $$QMAKE_IOS_SDK_PATH -- cgit v1.2.3