diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-01-26 15:24:41 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-01-26 15:26:59 +0300 |
| commit | 09c22a5db14f7d0ce7e7a87e48e3863534ee55d7 (patch) | |
| tree | 441430c351099e14cbcfc090bb464e82434346de /toolchain | |
| parent | df4b0d85beddb76c4b35acfedcce33385b11717f (diff) | |
toolchain: update win32-msvc2015 x64 and x86 toolchains to include ucrt lib dir.
The x86_xp toolchain already does this. It is necessary for link.exe to
link against the MSVC2015 CRT.
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/win32-msvc2015/x64.toolchain | 1 | ||||
| -rw-r--r-- | toolchain/win32-msvc2015/x86.toolchain | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/toolchain/win32-msvc2015/x64.toolchain b/toolchain/win32-msvc2015/x64.toolchain index 1fa764be8..afd0e6c56 100644 --- a/toolchain/win32-msvc2015/x64.toolchain +++ b/toolchain/win32-msvc2015/x64.toolchain @@ -37,3 +37,4 @@ INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt" QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\\amd64\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\\amd64\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)um\\x64\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)ucrt\\x64\""
diff --git a/toolchain/win32-msvc2015/x86.toolchain b/toolchain/win32-msvc2015/x86.toolchain index dd7e3851c..8d9ffc170 100644 --- a/toolchain/win32-msvc2015/x86.toolchain +++ b/toolchain/win32-msvc2015/x86.toolchain @@ -27,3 +27,4 @@ INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt" QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\""
QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)um\\x86\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""
|