| diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/mkspecs/common/g++-win32.conf qt-everywhere-src-5.12.4/qtbase/mkspecs/common/g++-win32.conf |
| --- qt-everywhere-src-5.12.4-orig/qtbase/mkspecs/common/g++-win32.conf 2019-06-12 23:59:14.000000000 +0300 |
| +++ qt-everywhere-src-5.12.4/qtbase/mkspecs/common/g++-win32.conf 2019-06-15 14:48:51.365125400 +0300 |
| @@ -13,6 +13,9 @@ |
| include(gcc-base.conf) |
| include(g++-base.conf) |
| |
| +include(angle.conf) |
| +include(windows-vulkan.conf) |
| + |
| # modifications to gcc-base.conf and g++-base.conf |
| |
| MAKEFILE_GENERATOR = MINGW |
| @@ -34,6 +37,7 @@ |
| QMAKE_CXXFLAGS_RTTI_ON = -frtti |
| QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti |
| QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads |
| +QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions |
| |
| QMAKE_INCDIR = |
| |
| @@ -60,6 +64,9 @@ |
| QMAKE_EXTENSION_STATICLIB = a |
| QMAKE_LIB_EXTENSIONS = a dll.a |
| |
| +PKG_CONFIG = $${CROSS_COMPILE}pkg-config |
| +QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config |
| + |
| QMAKE_LIBS = |
| QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 |
| QMAKE_LIBS_NETWORK = -lws2_32 |
| @@ -69,14 +76,12 @@ |
| QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 |
| QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain |
| |
| -QMAKE_IDL = midl |
| +QMAKE_IDL = $${CROSS_COMPILE}widl |
| QMAKE_LIB = $${CROSS_COMPILE}ar -rc |
| QMAKE_RC = $${CROSS_COMPILE}windres |
| +QMAKE_DLLTOOL = $${CROSS_COMPILE}dlltool |
| |
| QMAKE_STRIP = $${CROSS_COMPILE}strip |
| QMAKE_STRIPFLAGS_LIB += --strip-unneeded |
| QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy |
| QMAKE_NM = $${CROSS_COMPILE}nm -P |
| - |
| -include(angle.conf) |
| -include(windows-vulkan.conf) |
| diff -Naur qt-everywhere-src-5.14.2-orig/qtbase/mkspecs/common/windows-vulkan.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/common/windows-vulkan.conf |
| --- qt-everywhere-src-5.14.2-orig/qtbase/mkspecs/common/windows-vulkan.conf 2019-06-12 23:59:14.000000000 +0300 |
| +++ qt-everywhere-src-5.14.2/qtbase/mkspecs/common/windows-vulkan.conf 2019-06-15 14:48:51.365125400 +0300 |
| @@ -1,2 +1,2 @@ |
| -load(windows_vulkan_sdk) |
| +load(win32/windows_vulkan_sdk) |
| QMAKE_LIBS_VULKAN = |
