diff options
Diffstat (limited to 'mkspecs/common')
-rw-r--r-- | mkspecs/common/clang.conf | 10 | ||||
-rw-r--r-- | mkspecs/common/ios/qmake.conf | 3 | ||||
-rw-r--r-- | mkspecs/common/mac.conf | 2 | ||||
-rw-r--r-- | mkspecs/common/macx.conf | 2 |
4 files changed, 2 insertions, 15 deletions
diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index 4f141351c1..ace2496f10 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -20,13 +20,3 @@ QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE QMAKE_CXXFLAGS_CXX11 = -std=c++11 QMAKE_LFLAGS_CXX11 = - -QMAKE_CFLAGS_SSE2 += -msse2 -QMAKE_CFLAGS_SSE3 += -msse3 -QMAKE_CFLAGS_SSSE3 += -mssse3 -QMAKE_CFLAGS_SSE4_1 += -msse4.1 -QMAKE_CFLAGS_SSE4_2 += -msse4.2 -QMAKE_CFLAGS_AVX += -mavx -QMAKE_CFLAGS_AVX2 += -mavx2 -QMAKE_CFLAGS_IWMMXT += -mcpu=iwmmxt -QMAKE_CFLAGS_NEON += -mfpu=neon diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf index 39465aa765..3c477438a3 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/ios/qmake.conf @@ -15,9 +15,6 @@ QMAKE_RANLIB = ranlib -s QMAKE_LINK = $$QMAKE_CXX QMAKE_LINK_SHLIB = $$QMAKE_CXX -# Basic iOS frameworks needed for any GUI app -QMAKE_LFLAGS += -framework Foundation -framework UIKit -framework QuartzCore -lz - # No OpenGL ES1 QMAKE_INCDIR_OPENGL_ES1 = QMAKE_LIBDIR_OPENGL_ES1 = diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 1b480aa267..4421665370 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -4,7 +4,7 @@ !load(device_config): error(Could not successfully load device configuration) -QMAKE_PLATFORM += mac +QMAKE_PLATFORM += mac darwin QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_EXTENSION_SHLIB = dylib diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 48efae5d1e..ad54612f22 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -2,7 +2,7 @@ # qmake configuration for common OS X # -QMAKE_PLATFORM += macx +QMAKE_PLATFORM += osx macx QMAKE_MAC_SDK = macosx include(mac.conf) |