diff options
| author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-07-10 12:39:42 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-08-06 07:43:03 +0000 |
| commit | b5662e3fce2af7ffa15333f7b61348f8be043646 (patch) | |
| tree | 7807d629776b9973ea6d547e09687f698c7d4cce | |
| parent | 9bc8acc6cbc1b29f53c06e96cd17c342443ef673 (diff) | |
| download | qtbase-b5662e3fce2af7ffa15333f7b61348f8be043646.tar.gz | |
WinRT: Fix build for Windows 10
bf24838c3344f009f9fe40f596a4eab798f071b3 introduced a hard dependency on
kernel32.lib, which needs to be added for the msvc2015 mkspecs.
As the library differs for Windows Phone / Windows 10 Mobile, this most
likely has the side-effect that we will need to introduce winphone-xxx-
msvc2015 at a later stage.
Change-Id: I8fa2a68d421345c14ba90efc6faa5eea1ad457e1
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
| -rw-r--r-- | mkspecs/winrt-arm-msvc2015/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/winrt-x64-msvc2015/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/winrt-x86-msvc2015/qmake.conf | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/winrt-arm-msvc2015/qmake.conf b/mkspecs/winrt-arm-msvc2015/qmake.conf index fcb6d99aa9..b86958a084 100644 --- a/mkspecs/winrt-arm-msvc2015/qmake.conf +++ b/mkspecs/winrt-arm-msvc2015/qmake.conf @@ -10,9 +10,9 @@ DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP ARM __ARM__ __arm__ QMAKE_CFLAGS += -FS QMAKE_CXXFLAGS += -FS -QMAKE_LFLAGS += /MACHINE:ARM /NODEFAULTLIB:kernel32.lib +QMAKE_LFLAGS += /MACHINE:ARM -QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib +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 diff --git a/mkspecs/winrt-x64-msvc2015/qmake.conf b/mkspecs/winrt-x64-msvc2015/qmake.conf index e8062f5364..0f3f16a819 100644 --- a/mkspecs/winrt-x64-msvc2015/qmake.conf +++ b/mkspecs/winrt-x64-msvc2015/qmake.conf @@ -10,9 +10,9 @@ DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP X64 __X64__ __x64__ QMAKE_CFLAGS += -FS QMAKE_CXXFLAGS += -FS -QMAKE_LFLAGS += /MACHINE:X64 /NODEFAULTLIB:kernel32.lib +QMAKE_LFLAGS += /MACHINE:X64 -QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib +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 diff --git a/mkspecs/winrt-x86-msvc2015/qmake.conf b/mkspecs/winrt-x86-msvc2015/qmake.conf index 5b44a97e8d..51a4ec9366 100644 --- a/mkspecs/winrt-x86-msvc2015/qmake.conf +++ b/mkspecs/winrt-x86-msvc2015/qmake.conf @@ -10,9 +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 +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 |