Skip to content

Commit

Permalink
toolchain/win32-msvc2013: escape all backslahes to make qmake happy.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkrautz
mkrautz committed Jul 5, 2016
1 parent f35d0cb commit bcbf371
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 52 deletions.
40 changes: 20 additions & 20 deletions toolchain/win32-msvc2013/x64.toolchain
View file
Expand Up @@ -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\""
34 changes: 17 additions & 17 deletions toolchain/win32-msvc2013/x86-xp.toolchain
View file
Expand Up @@ -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\""
30 changes: 15 additions & 15 deletions toolchain/win32-msvc2013/x86.toolchain
View file
Expand Up @@ -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\""

0 comments on commit bcbf371

Please sign in to comment.