From 08f457dd1db042b7acb9f8cda0f02a0764e3623e Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Thu, 15 Dec 2011 15:59:20 +0000 Subject: [PATCH] DFCH: boost and wxWidgets changes --- .../scripts/install_thirdparty_all.bat | 14 ++++++++------ .../scripts/move_thirdparty_dlls.bat | 6 +++--- .../scripts/move_thirdparty_libraries.bat | 16 +++++++++------- 3 files changed, 20 insertions(+), 16 deletions(-) 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-------- diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat index a58ae04..9a07814 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat @@ -16,7 +16,7 @@ set creaThirdPartydlls=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dll 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 @@ -77,8 +77,8 @@ echo ----------------------------------- echo -------------Boost----------------- echo ----------------------------------- -set boostMT=-vc100-mt-1_47.dll -set boostMTGD=-vc100-mt-gd-1_47.dll +set boostMT=-vc100-mt-1_46_1.dll +set boostMTGD=-vc100-mt-gd-1_46_1.dll copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMT% %creaThirdPartydlls% copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMTGD% %creaThirdPartydlls% diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat index e62112e..b7f9863 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat @@ -28,7 +28,7 @@ set creaThirdPartyLibraries=%thirdpartyGeneration%\thirdparty_temp\creaThirdPart 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 @@ -153,6 +153,8 @@ mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\ XCOPY %WXDIR%\include\* %creaThirdPartyLibraries%\%wxWidgets%\include\ /s /i +copy /V /Y %WXDIR%\wx-config.in %creaThirdPartyLibraries%\%wxWidgets%\ + copy /V /Y %WXDIR%\lib\dummy %creaThirdPartyLibraries%\%wxWidgets%\lib\ copy /V /Y %WXDIR%\lib\vms.opt %creaThirdPartyLibraries%\%wxWidgets%\lib\ copy /V /Y %WXDIR%\lib\vms_gtk.opt %creaThirdPartyLibraries%\%wxWidgets%\lib\ @@ -182,9 +184,9 @@ copy /V /Y %WXDIR%\lib\vc_dll\wxscintilla.lib %creaThirdPartyLibraries%\%wxWidge copy /V /Y %WXDIR%\lib\vc_dll\wxtiff.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll copy /V /Y %WXDIR%\lib\vc_dll\wxzlib.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll -mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\mswu +mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\msw -XCOPY %WXDIR%\lib\vc_dll\mswu\* %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\mswu /s /i +XCOPY %WXDIR%\lib\vc_dll\msw\* %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\msw /s /i mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\jpeg mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\png @@ -201,10 +203,10 @@ echo ----------------------------------- echo -------------Boost----------------- echo ----------------------------------- -set boostMT=-vc100-mt-1_47.lib -set boostMTGD=-vc100-mt-gd-1_47.lib -set boostMTS=-vc100-mt-s-1_47.lib -set boostMTSGD=-vc100-mt-sgd-1_47.lib +set boostMT=-vc100-mt-1_46_1.lib +set boostMTGD=-vc100-mt-gd-1_46_1.lib +set boostMTS=-vc100-mt-s-1_46_1.lib +set boostMTSGD=-vc100-mt-sgd-1_46_1.lib mkdir %creaThirdPartyLibraries%\%boost% -- 2.45.0