diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/winrt/default_pre.prf | 12 | ||||
| -rw-r--r-- | mkspecs/winrt-arm-msvc2015/qmake.conf | 10 | ||||
| -rw-r--r-- | mkspecs/winrt-x64-msvc2015/qmake.conf | 10 | ||||
| -rw-r--r-- | mkspecs/winrt-x86-msvc2015/qmake.conf | 10 |
4 files changed, 12 insertions, 30 deletions
diff --git a/mkspecs/features/winrt/default_pre.prf b/mkspecs/features/winrt/default_pre.prf new file mode 100644 index 0000000000..44e3c94b8a --- /dev/null +++ b/mkspecs/features/winrt/default_pre.prf @@ -0,0 +1,12 @@ +*msvc2015 { + # Note that the order is important, ucrt(d) has to be first + # Otherwise the linker might use malloc from a different library + # but free_dbg() from the runtime, causing assert when deleting + # items from different heaps + CONFIG(debug, debug|release): \ + QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS + else: \ + QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS +} + +load(default_pre) diff --git a/mkspecs/winrt-arm-msvc2015/qmake.conf b/mkspecs/winrt-arm-msvc2015/qmake.conf index b86958a084..44c91a5e80 100644 --- a/mkspecs/winrt-arm-msvc2015/qmake.conf +++ b/mkspecs/winrt-arm-msvc2015/qmake.conf @@ -14,16 +14,6 @@ QMAKE_LFLAGS += /MACHINE:ARM QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib -# Note that the order is important, ucrt(d) has to be first -# Otherwise the linker might use malloc from a different library -# but free_dbg() from the runtime, causing assert when deleting -# items from different heaps -CONFIG(debug, debug|release) { - QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS -} else { - QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS -} - VCPROJ_ARCH = ARM MSVC_VER = 14.0 WINSDK_VER = 10.0 diff --git a/mkspecs/winrt-x64-msvc2015/qmake.conf b/mkspecs/winrt-x64-msvc2015/qmake.conf index 0f3f16a819..a6c5db6f0f 100644 --- a/mkspecs/winrt-x64-msvc2015/qmake.conf +++ b/mkspecs/winrt-x64-msvc2015/qmake.conf @@ -14,16 +14,6 @@ QMAKE_LFLAGS += /MACHINE:X64 QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib -# Note that the order is important, ucrt(d) has to be first -# Otherwise the linker might use malloc from a different library -# but free_dbg() from the runtime, causing assert when deleting -# items from different heaps -CONFIG(debug, debug|release) { - QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS -} else { - QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS -} - VCPROJ_ARCH = x64 MSVC_VER = 14.0 WINSDK_VER = 10.0 diff --git a/mkspecs/winrt-x86-msvc2015/qmake.conf b/mkspecs/winrt-x86-msvc2015/qmake.conf index 51a4ec9366..dfeaf63e2c 100644 --- a/mkspecs/winrt-x86-msvc2015/qmake.conf +++ b/mkspecs/winrt-x86-msvc2015/qmake.conf @@ -14,16 +14,6 @@ QMAKE_LFLAGS += /SAFESEH /MACHINE:X86 QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib -# Note that the order is important, ucrt(d) has to be first -# Otherwise the linker might use malloc from a different library -# but free_dbg() from the runtime, causing assert when deleting -# items from different heaps -CONFIG(debug, debug|release) { - QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS -} else { - QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS -} - VCPROJ_ARCH = Win32 MSVC_VER = 14.0 WINSDK_VER = 10.0 |