From bcbf37161ff702b8e297b76fd9ad3e607d899b1d Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Tue, 5 Jul 2016 22:36:34 +0200 Subject: [PATCH] toolchain/win32-msvc2013: escape all backslahes to make qmake happy. --- toolchain/win32-msvc2013/x64.toolchain | 40 +++++++++++------------ toolchain/win32-msvc2013/x86-xp.toolchain | 34 +++++++++---------- toolchain/win32-msvc2013/x86.toolchain | 30 ++++++++--------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/toolchain/win32-msvc2013/x64.toolchain b/toolchain/win32-msvc2013/x64.toolchain index c11decb2f2c..c1a0fc7ad43 100644 --- a/toolchain/win32-msvc2013/x64.toolchain +++ b/toolchain/win32-msvc2013/x64.toolchain @@ -13,29 +13,29 @@ # environment. # 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_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\"" # ...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\"" +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_RC = \""$$(WindowsSdkDir)\bin\x64\rc.exe\"" +QMAKE_RC = \""$$(WindowsSdkDir)\\bin\\x64\\rc.exe\"" -INCLUDEPATH *= "$$(VCINSTALLDIR)\include" -INCLUDEPATH *= "$$(VCINSTALLDIR)\atlmfc\include" -INCLUDEPATH *= "$$(WindowsSdkDir)\include\shared" -INCLUDEPATH *= "$$(WindowsSdkDir)\include\um" -INCLUDEPATH *= "$$(WindowsSdkDir)\include\winrt" -INCLUDEPATH *= "$$(DXSDK_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" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\lib\amd64\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\atlmfc\lib\amd64\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\lib\winv6.3\um\x64\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\lib\x64\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\\amd64\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\\amd64\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\winv6.3\\um\\x64\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\\lib\\x64\"" diff --git a/toolchain/win32-msvc2013/x86-xp.toolchain b/toolchain/win32-msvc2013/x86-xp.toolchain index 12d5c32cc74..3cada75f0dc 100644 --- a/toolchain/win32-msvc2013/x86-xp.toolchain +++ b/toolchain/win32-msvc2013/x86-xp.toolchain @@ -14,23 +14,23 @@ # 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_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_" -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\\shared" +INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um" +INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\lib\x86\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\lib\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\atlmfc\lib\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\lib\winv6.3\um\x86\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\\lib\\x86\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\winv6.3\\um\\x86\"" diff --git a/toolchain/win32-msvc2013/x86.toolchain b/toolchain/win32-msvc2013/x86.toolchain index 33a77bfe91e..8c0ceae1d9d 100644 --- a/toolchain/win32-msvc2013/x86.toolchain +++ b/toolchain/win32-msvc2013/x86.toolchain @@ -12,20 +12,20 @@ # of the native architecture of the build # environment. -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_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\"" -INCLUDEPATH *= "$$(VCINSTALLDIR)\include" -INCLUDEPATH *= "$$(VCINSTALLDIR)\atlmfc\include" -INCLUDEPATH *= "$$(WindowsSdkDir)\include\shared" -INCLUDEPATH *= "$$(WindowsSdkDir)\include\um" -INCLUDEPATH *= "$$(WindowsSdkDir)\include\winrt" -INCLUDEPATH *= "$$(DXSDK_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" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\lib\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\atlmfc\lib\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\lib\winv6.3\um\x86\"" -QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\lib\x86\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\winv6.3\\um\\x86\"" +QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\\lib\\x86\""