X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_all.bat;h=e1dc428d464b43e8e8dfe8c4d7060bd876cf998d;hb=08f457dd1db042b7acb9f8cda0f02a0764e3623e;hp=ee93b89d3d9dcbde7b107ab7bbec1b47613fc755;hpb=0b7edc57e91a37a9ce8fafc3730871b4d4ca083f;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index ee93b89..e1dc428 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -62,7 +62,7 @@ set sourcepath=%thirdpartyGeneration%\thirdparty_source
 
 set qt=Qt-4.7.3
 set wxWidgets=wxWidgets-2.9.2
-set boost=Boost-1.47.0
+set boost=Boost-1.46.1
 set xercesc=xerces-c-3.1.1
 set itk=InsightToolkit-3.20.0
 set gdcm=gdcm
@@ -104,6 +104,7 @@ echo ITKSRCDIR=%ITKSRCDIR%
 echo VTKSRCDIR=%VTKSRCDIR%
 echo GDCMDIR=%GDCMSRCDIR%
 
+
 echo -----------------------------------
 echo ---End Setting Global Variables----
 echo -----------------------------------
@@ -180,7 +181,7 @@ del %sourcepath%\wxWidgets-2.9.2.7z
 echo ----------Installing---------------
 
 cd %sourcepath%\%wxWidgets%\build\msw
-nmake -f makefile.vc BUILD=%buildType% UNICODE=1 SHARED=1
+nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1
 cd C:\
 
 echo ----End wxWidgets Installation-----
@@ -191,12 +192,12 @@ echo -----------------------------------
 echo ----------Extracting---------------
 
 cd %sourcepath%
-%zipPath% x %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
-del %thirdpartyGeneration%\thirdparty_source\boost_1_47_0.7z
+%zipPath% x %thirdpartyGeneration%\thirdparty_source\boost_1_46_1.7z
+del %thirdpartyGeneration%\thirdparty_source\boost_1_46_1.7z
 
 echo --------Renaming Folder------------
 
-rename boost_1_47_0 %boost%
+rename boost_1_46_1 %boost%
 
 echo ----------Installing---------------
 
@@ -204,8 +205,9 @@ mkdir %binpath%\%boost%Bin
 mkdir %installpath%\%boost%
 
 cd %sourcepath%\%boost%
+
 call bootstrap.bat
-b2.exe --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared --prefix=%installpath%\%boost% install
+bjam.exe --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared --prefix=%installpath%\%boost% install
 cd C:\
 
 echo -----End Boost Installation--------