boost fetch & build

Common/3dParty/boost/build.bat

@@ -6,32 +6,36 @@ if defined ProgramFiles(x86) (
 	SET platform=win_64
 )
 
-outputdir="%SCRIPTPATH%/boost_1_58_0/build/%platform%"
+SET outputdir=%SCRIPTPATH%boost_1_58_0\build\%platform%
 echo "%outputdir%"
 
-CD "%SCRIPTPATH%/boost_1_58_0"
-call .\bootstrap.bat --with-libraries=filesystem,system
+CD "%SCRIPTPATH%\boost_1_58_0"
+call .\bootstrap.bat
 
 SET folder=build/%platform%
 if exist "%folder%" (
 	RMDIR "%folder%" /S /Q
 )
 
-mkdir build
-mkdir  %folder%
-mkdir  %folder%/static
-mkdir  %folder%/static_fpic
-mkdir  %folder%/shared
+if exist "stage" (
+	RMDIR "stage" /S /Q
+)
+
+md build
+md  %folder%
+md  %folder%\static
+md  %folder%\static_fpic
+md  %folder%\shared
 
-.\b2 --clean
-.\bjam link=static
+.\b2.exe --clean
+.\bjam.exe link=static --with-filesystem --with-system
 XCOPY stage\lib\* "%folder%\static\"
 
-.\b2 --clean
-.\bjam link=static cxxflags=-fPIC
+.\b2.exe --clean
+.\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system
 XCOPY stage\lib\* "%folder%\static_fpic\"
 
-.\b2 --clean
-.\bjam link=shared
+.\b2.exe --clean
+.\bjam.exe link=shared --with-filesystem --with-system
 XCOPY stage\lib\* "%folder%\shared\"
 

Common/3dParty/boost/build.sh

@@ -31,6 +31,11 @@ if [ -d $folder ]; then
   rm -R $folder
 fi
 
+stage="stage"
+if [ -d $stage ]; then
+  rm -R $stage
+fi
+
 mkdir -p "$folder"
 mkdir -p "$folder/static"
 mkdir -p "$folder/static_fpic"

Common/3dParty/boost/fetch.bat

 SET SCRIPTPATH=%~dp0
 CD /D %~dp0
 
-if exist "%SCRIPTPATH%/boost_1_58_0.7z" (
+if exist "%SCRIPTPATH%boost_1_58_0.7z" (
     echo "boost already downloaded"
 ) else (
     Powershell.exe Invoke-WebRequest -OutFile boost_1_58_0.7z http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z
 )
 
-if exist "%SCRIPTPATH%/boost_1_58_0/" (
+SET UNSIP_PROGRAMM="C:\Program Files\7-Zip\7z.exe"
+SET UNSIP_PROGRAMM2="C:\Program Files (x86)\7-Zip\7z.exe"
+if exist %UNSIP_PROGRAMM2% (
+	SET UNSIP_PROGRAMM=%UNSIP_PROGRAMM2%
+)
+
+if exist "%SCRIPTPATH%boost_1_58_0/" (
 	echo "boost already extracted"
 ) else (
-    call "C:\Program Files\7-Zip\7z.exe" x "%SCRIPTPATH%/boost_1_58_0.7z" -o"%SCRIPTPATH%/"
+    call %UNSIP_PROGRAMM% x "%SCRIPTPATH%/boost_1_58_0.7z" -o"%SCRIPTPATH%/"
 )
 
 pause
\ No newline at end of file