diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2012-08-19 13:15:20 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2012-08-19 13:15:20 +0400 |
| commit | a0b370612590894afae53d6f388076e4771a4c31 (patch) | |
| tree | 1acea7dc47ab793371f3b264215af075d19892a5 /compiler.pri | |
| parent | beea3015a6bb2063de0781d7e31a699cd0d9e709 (diff) | |
compiler.pri: fix mistakes from previous commit; use QMAKE_OBJECTIVE_C(XX)FLAGS for ObjC-flags.
Diffstat (limited to 'compiler.pri')
| -rw-r--r-- | compiler.pri | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/compiler.pri b/compiler.pri index 8b7af3d3f..22b3f424c 100644 --- a/compiler.pri +++ b/compiler.pri @@ -122,20 +122,27 @@ unix:!macx { } macx { - SYSTEM_INCLUDES = $$(MUMBLE_PREFIX)/include $$(MUMBLE_PREFIX)/include/boost_1_50_0/ $$[QT_INSTALL_HEADERS] + SYSTEM_INCLUDES = $$(MUMBLE_PREFIX)/include $$(MUMBLE_PREFIX)/include/boost_1_50_0 $$[QT_INSTALL_HEADERS] QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/lib + for(inc, $$list($$SYSTEM_INCLUDES)) { + QMAKE_CFLAGS += -isystem $$inc + QMAKE_CXXFLAGS += -isystem $$inc + QMAKE_OBJECTIVE_CFLAGS += -isystem $$inc + QMAKE_OBJECTIVE_CXXFLAGS += -isystem $$inc + } + !CONFIG(universal) { CONFIG += no-pch - QMAKE_MAC_SDK = $$system(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/ + QMAKE_MAC_SDK = $$system(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk QMAKE_CC = $$system(xcrun -find clang) QMAKE_CXX = $$system(xcrun -find clang++) QMAKE_LINK = $$system(xcrun -find clang++) QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - QMAKE_CFLAGS += ${SYSTEM_INCLUDES} -mmacosx-version-min=10.6 - QMAKE_CXXFLAGS += ${SYSTEM_INCLUDES} -mmacosx-version-min=10.6 - QMAKE_OBJCFLAGS += ${SYSTEM_INCLUDES} -mmacosx-version-min=10.6 - QMAKE_OBJCXXFLAGS += ${SYSTEM_INCLUDES} -mmacosx-version-min=10.6 + QMAKE_CFLAGS += -mmacosx-version-min=10.6 + QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 + QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.6 + QMAKE_OBJECTIVE_CXXFLAGS += -mmacosx-version-min=10.6 } else { XCODE_PATH=$$system(xcode-select -print-path) CONFIG += x86 ppc no-cocoa @@ -144,10 +151,10 @@ macx { QMAKE_CXX = $${XCODE_PATH}/usr/bin/g++-4.2 QMAKE_LINK = $${XCODE_PATH}/usr/bin/g++-4.2 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 - QMAKE_CFLAGS += ${SYSTEM_INCLUDES} -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 - QMAKE_CXXFLAGS += ${SYSTEM_INCLUDES} -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 - QMAKE_OBJCFLAGS += ${SYSTEM_INCLUDES} -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 - QMAKE_OBJCXXFLAGS += ${SYSTEM_INCLUDES} -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 + QMAKE_CFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 + QMAKE_CXXFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 + QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 + QMAKE_OBJECTIVE_CXXFLAGS += -mmacosx-version-min=10.4 -Xarch_i386 -mmmx -Xarch_i386 -msse -Xarch_i386 -msse2 } QMAKE_LFLAGS += -Wl,-dead_strip -framework Cocoa -framework Carbon |