diff options
Diffstat (limited to 'qmake/toolchain/win32-msvc2015/x86.toolchain')
-rw-r--r-- | qmake/toolchain/win32-msvc2015/x86.toolchain | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/qmake/toolchain/win32-msvc2015/x86.toolchain b/qmake/toolchain/win32-msvc2015/x86.toolchain index ffc8d1548..9dd1b250b 100644 --- a/qmake/toolchain/win32-msvc2015/x86.toolchain +++ b/qmake/toolchain/win32-msvc2015/x86.toolchain @@ -14,17 +14,17 @@ QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\cl.exe\""
QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\cl.exe\""
-QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\lib.exe\""
-QMAKE_RC = \""$$(WindowsSdkDir)\\bin\\x86\\rc.exe\""
+QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\link.exe\""
+QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\lib.exe\""
+QMAKE_RC = \""$$(WindowsSdkDir)bin\\$$(WindowsSDKLibVersion)x86\\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\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)um\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""
+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\""
|