diff options
Diffstat (limited to 'qmake/toolchain/win32-msvc2015/x64.toolchain')
-rw-r--r-- | qmake/toolchain/win32-msvc2015/x64.toolchain | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/qmake/toolchain/win32-msvc2015/x64.toolchain b/qmake/toolchain/win32-msvc2015/x64.toolchain index 1fff4329c..1a053a2d1 100644 --- a/qmake/toolchain/win32-msvc2015/x64.toolchain +++ b/qmake/toolchain/win32-msvc2015/x64.toolchain @@ -12,29 +12,29 @@ # of the native architecture of the build
# environment.
-# Use the x86-based amd64 cross compiler by default.
+# Use the x86-based amd64 cross compiler by default...
QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\x86_amd64\\cl.exe\""
QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\x86_amd64\\cl.exe\""
-QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\x86_amd64\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\x86_amd64\\lib.exe\""
+QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\x86_amd64\\link.exe\""
+QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\x86_amd64\\lib.exe\""
-# ...but use the native amd64 compiler if it is available.
+# ... but use the native amd64 compiler if it is available.
exists($$(VCINSTALLDIR)\\bin\\amd64) {
QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\amd64\\cl.exe\""
QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\amd64\\cl.exe\""
- QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\amd64\\link.exe\""
- QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\amd64\\lib.exe\""
+ QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\amd64\\link.exe\""
+ QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\amd64\\lib.exe\""
}
-QMAKE_RC = \""$$(WindowsSdkDir)\\bin\\x64\\rc.exe\""
+QMAKE_RC = \""$$(WindowsSdkDir)bin\\$$(WindowsSDKLibVersion)x64\\rc.exe\""
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
+INCLUDEPATH *= "$$(VCINSTALLDIR)include"
+INCLUDEPATH *= "$$(VCINSTALLDIR)atlmfc\\include"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)shared"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)um"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)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\""
+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\""
|