summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-g++/qmake.conf
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/win32-g++/qmake.conf')
-rw-r--r--mkspecs/win32-g++/qmake.conf8
1 files changed, 2 insertions, 6 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 12f3567754..9f366e08b8 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -10,6 +10,8 @@
load(device_config)
include(../common/gcc-base.conf)
include(../common/g++-base.conf)
+include(../common/angle.conf)
+include(../common/windows-vulkan.conf)
# modifications to gcc-base.conf and g++-base.conf
@@ -31,8 +33,6 @@ QMAKE_CFLAGS += -fno-keep-inline-dllexport
QMAKE_CFLAGS_WARN_ON += -Wextra
QMAKE_CFLAGS_SSE2 += -mstackrealign
-QMAKE_CFLAGS_AESNI = -maes
-QMAKE_CFLAGS_SHANI = -msha
QMAKE_CXX = $${CROSS_COMPILE}g++
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
@@ -86,8 +86,4 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded
QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
QMAKE_NM = $${CROSS_COMPILE}nm -P
-include(../common/angle.conf)
-include(../common/windows-vulkan.conf)
-include(../common/gcc-base.conf)
-
load(qt_config)