mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qmake: fix paths in toolchains to support recent Windows SDK versions

Browse Source 
Libraries were already in versioned directories, but in recent versions of the Windows 10 SDK that's the case for executables and includes as well.

This commit also removes duplicate backslashes in the paths. Fortunately it was only a cosmetic issue (in the console output).
This commit is contained in:
Davide Beatrici 2020-04-09 10:55:02 +02:00
parent 9755cfa5a7
commit 1d67ebc6a5
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
qmake/toolchain/win32-msvc2015/x64.toolchain
View File

@ -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\""

30
qmake/toolchain/win32-msvc2015/x86-xp.toolchain
View File

@ -14,24 +14,24 @@
# Windows XP, regardless of the native
# architecture of the build environment.
WIN7_XP_SDK_DIR="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A"
WIN7_XP_SDK_DIR="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A\\"
QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\cl.exe\" /D_USING_V110_SDK71_"
QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\cl.exe\" /D_USING_V110_SDK71_"
QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\link.exe\""
QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\lib.exe\""
QMAKE_RC = \""$${WIN7_XP_SDK_DIR}\\bin\\rc.exe\" /D_USING_V110_SDK71_"
QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\link.exe\""
QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\lib.exe\""
QMAKE_RC = \""$${WIN7_XP_SDK_DIR}bin\\rc.exe\" /D_USING_V110_SDK71_"
INCLUDEPATH *= "$$(DXSDK_DIR)\\include"
INCLUDEPATH *= "$${WIN7_XP_SDK_DIR}\\include"
INCLUDEPATH *= "$$(VCINSTALLDIR)\\include"
INCLUDEPATH *= "$$(VCINSTALLDIR)\\atlmfc\\include"
INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\shared"
INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um"
INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
INCLUDEPATH *= "$$(DXSDK_DIR)include"
INCLUDEPATH *= "$${WIN7_XP_SDK_DIR}include"
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:\"$$(DXSDK_DIR)\\lib\\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\""
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\""

24
qmake/toolchain/win32-msvc2015/x86.toolchain
View File

@ -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\""