diff options
Diffstat (limited to 'mkspecs/winrt-x86-msvc2015/qmake.conf')
| -rw-r--r-- | mkspecs/winrt-x86-msvc2015/qmake.conf | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/mkspecs/winrt-x86-msvc2015/qmake.conf b/mkspecs/winrt-x86-msvc2015/qmake.conf index 5b44a97e8d..dfeaf63e2c 100644 --- a/mkspecs/winrt-x86-msvc2015/qmake.conf +++ b/mkspecs/winrt-x86-msvc2015/qmake.conf @@ -10,19 +10,9 @@ DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP X86 __X86__ __x86__ QMAKE_CFLAGS += -FS QMAKE_CXXFLAGS += -FS -QMAKE_LFLAGS += /SAFESEH /MACHINE:X86 /NODEFAULTLIB:kernel32.lib +QMAKE_LFLAGS += /SAFESEH /MACHINE:X86 -QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.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 -} +QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib VCPROJ_ARCH = Win32 MSVC_VER = 14.0 |