mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 13:22:11 +00:00
Make default paths use %ProgramFiles%.
[SVN r19366]
This commit is contained in:
@@ -34,7 +34,9 @@ if ! $(MSVCDir)
|
||||
# In case someone set VISUALC in order to build Jam, we can just use that.
|
||||
MSVC_ROOT ?= $(VISUALC) ;
|
||||
# Otherwise, guess a standard installation directory
|
||||
MSVC_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio\\VC98" ;
|
||||
|
||||
ProgramFiles ?= $(PROGRAMFILES) ;
|
||||
MSVC_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio\\VC98" ;
|
||||
|
||||
# Reconstitutes paths containing spaces
|
||||
MSVC_ROOT = $(MSVC_ROOT:J=" ") ;
|
||||
|
||||
@@ -34,7 +34,9 @@ if ! $(MSVCDir)
|
||||
# In case someone set VISUALC in order to build Jam, we can just use that.
|
||||
MSVC_ROOT ?= $(VISUALC) ;
|
||||
# Otherwise, guess a standard installation directory
|
||||
MSVC_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio\\VC98" ;
|
||||
|
||||
ProgramFiles ?= $(PROGRAMFILES) ;
|
||||
MSVC_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio\\VC98" ;
|
||||
|
||||
# Reconstitutes paths containing spaces
|
||||
MSVC_ROOT = $(MSVC_ROOT:J=" ") ;
|
||||
|
||||
@@ -5,7 +5,8 @@ set-as-singleton VC7_ROOT ;
|
||||
|
||||
if ! $(MSVCDir)
|
||||
{
|
||||
VC7_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET\\VC7" ;
|
||||
ProgramFiles ?= $(PROGRAMFILES) ;
|
||||
VC7_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio .NET\\VC7" ;
|
||||
VC_TOOL_PATH = "$(VC7_ROOT)"\\bin\\ ;
|
||||
VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,8 @@ set-as-singleton VC71_ROOT ;
|
||||
|
||||
if ! $(MSVCDir)
|
||||
{
|
||||
VC71_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\VC7" ;
|
||||
ProgramFiles ?= $(PROGRAMFILES) ;
|
||||
VC71_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio .NET 2003\\VC7" ;
|
||||
VC_TOOL_PATH = "$(VC71_ROOT)"\\bin\\ ;
|
||||
VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,8 @@ set-as-singleton VC7_ROOT ;
|
||||
|
||||
if ! $(MSVCDir)
|
||||
{
|
||||
VC7_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET\\VC7" ;
|
||||
ProgramFiles ?= $(PROGRAMFILES) ;
|
||||
VC7_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio .NET\\VC7" ;
|
||||
VC_TOOL_PATH = "$(VC7_ROOT)"\\bin\\ ;
|
||||
VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,8 @@ set-as-singleton VC71_ROOT ;
|
||||
|
||||
if ! $(MSVCDir)
|
||||
{
|
||||
VC71_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\VC7" ;
|
||||
ProgramFiles ?= $(PROGRAMFILES) ;
|
||||
VC71_ROOT ?= "$(ProgramFiles)\\Microsoft Visual Studio .NET 2003\\VC7" ;
|
||||
VC_TOOL_PATH = "$(VC71_ROOT)"\\bin\\ ;
|
||||
VC_SETUP = "CALL \"$(VC_TOOL_PATH)VCVARS32.BAT\" >nul" ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user