mirror of
https://github.com/boostorg/build.git
synced 2026-02-14 00:32:11 +00:00
support building bjam using Visual Studio 2010.
[SVN r55041]
This commit is contained in:
@@ -28,7 +28,7 @@ ECHO ### You can specify the toolset as the argument, i.e.:
|
||||
ECHO ### .\build.bat msvc
|
||||
ECHO ###
|
||||
ECHO ### Toolsets supported by this script are: borland, como, gcc, gcc-nocygwin,
|
||||
ECHO ### intel-win32, metrowerks, mingw, msvc, vc7, vc8, vc9
|
||||
ECHO ### intel-win32, metrowerks, mingw, msvc, vc7, vc8, vc9, vc10
|
||||
ECHO ###
|
||||
call :Set_Error
|
||||
endlocal
|
||||
@@ -100,6 +100,16 @@ call :Clear_Error
|
||||
call :Test_Empty %ProgramFiles%
|
||||
if not errorlevel 1 set ProgramFiles=C:\Program Files
|
||||
|
||||
call :Clear_Error
|
||||
if NOT "_%VS100COMNTOOLS%_" == "__" (
|
||||
set "BOOST_JAM_TOOLSET=vc10"
|
||||
set "BOOST_JAM_TOOLSET_ROOT=%VS100COMNTOOLS%..\..\VC\"
|
||||
goto :eof)
|
||||
call :Clear_Error
|
||||
if EXIST "%ProgramFiles%\Microsoft Visual Studio 10.0\VC\VCVARSALL.BAT" (
|
||||
set "BOOST_JAM_TOOLSET=vc10"
|
||||
set "BOOST_JAM_TOOLSET_ROOT=%ProgramFiles%\Microsoft Visual Studio 10.0\VC\"
|
||||
goto :eof)
|
||||
call :Clear_Error
|
||||
if NOT "_%VS90COMNTOOLS%_" == "__" (
|
||||
set "BOOST_JAM_TOOLSET=vc9"
|
||||
@@ -346,6 +356,21 @@ set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0"
|
||||
set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0"
|
||||
set "_known_=1"
|
||||
:Skip_VC9
|
||||
if NOT "_%BOOST_JAM_TOOLSET%_" == "_vc10_" goto Skip_VC10
|
||||
if NOT "_%VS100COMNTOOLS%_" == "__" (
|
||||
set "BOOST_JAM_TOOLSET_ROOT=%VS100COMNTOOLS%..\..\VC\"
|
||||
)
|
||||
if "_%VCINSTALLDIR%_" == "__" call :Call_If_Exists "%BOOST_JAM_TOOLSET_ROOT%VCVARSALL.BAT" %BOOST_JAM_ARGS%
|
||||
if NOT "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
|
||||
if "_%VCINSTALLDIR%_" == "__" (
|
||||
set "PATH=%BOOST_JAM_TOOLSET_ROOT%bin;%PATH%"
|
||||
) )
|
||||
set "BOOST_JAM_CC=cl /nologo /RTC1 /Zi /MTd /Fobootstrap/ /Fdbootstrap/ -DNT -DYYDEBUG -wd4996 kernel32.lib advapi32.lib user32.lib"
|
||||
set "BOOST_JAM_OPT_JAM=/Febootstrap\jam0"
|
||||
set "BOOST_JAM_OPT_MKJAMBASE=/Febootstrap\mkjambase0"
|
||||
set "BOOST_JAM_OPT_YYACC=/Febootstrap\yyacc0"
|
||||
set "_known_=1"
|
||||
:Skip_VC10
|
||||
if NOT "_%BOOST_JAM_TOOLSET%_" == "_borland_" goto Skip_BORLAND
|
||||
if "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
|
||||
call :Test_Path bcc32.exe )
|
||||
|
||||
@@ -336,6 +336,13 @@ toolset vc9 cl : /Fe /Fe /Fd /Fo : -D
|
||||
[ opt --debug : /MTd /DEBUG /Z7 /Od /Ob0 /wd4996 ]
|
||||
-I$(--python-include) -I$(--extra-include)
|
||||
: kernel32.lib advapi32.lib user32.lib $(--python-lib[1]) ;
|
||||
## Microsoft Visual C++ 2010
|
||||
toolset vc10 cl : /Fe /Fe /Fd /Fo : -D
|
||||
: /nologo
|
||||
[ opt --release : /MT /O2 /Ob2 /Gy /GF /GA /wd4996 ]
|
||||
[ opt --debug : /MTd /DEBUG /Z7 /Od /Ob0 /wd4996 ]
|
||||
-I$(--python-include) -I$(--extra-include)
|
||||
: kernel32.lib advapi32.lib user32.lib $(--python-lib[1]) ;
|
||||
## VMS/OpenVMS DEC C
|
||||
toolset vmsdecc cc : /OBJECT= : "/DEFINES=(" "," ")"
|
||||
: /STANDARD=VAXC /PREFIX_LIBRARY_ENTRIES=ALL_ENTRIES
|
||||
|
||||
Reference in New Issue
Block a user