DFCH: ThirdParty Libraries installer generator working -- script tested and updated...

diff --git a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
index 4efe1bfa1cedd5ad642987777212bcc89defe50e..76e5b7fa37642cfd9dca7ca62194cc8724ad1ffb 100644 (file)
--- a/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
+++ b/Install_ThirdParty/install_generate_thirdparty.bat_TEMPLATE
@@ -5,7 +5,7 @@ echo ---Setting Environment Variables---
 echo -----------------------------------
 
 set thirdpartyGeneration=<directory where you want to generate>
-set buildType=<debug|release|RelWithDebInfo>
+set buildType=<debug|release>
 ::The following line sets wxWidgets version. Set it ON if you want to compile wxWidgets 2.8.12
 ::The following line set swxWidgets version. Set it OFF if you want to compile wxWidgets 2.9.3
 set wxStable=<ON|OFF>

diff --git a/Install_ThirdParty/scripts/download_ThirdPartySW.bat b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
index 71300460eb2b37935a31224a3d31e4a3ab5fd554..c76da1e0e8748bb4efe39b25d3511768681577d8 100644 (file)
--- a/Install_ThirdParty/scripts/download_ThirdPartySW.bat
+++ b/Install_ThirdParty/scripts/download_ThirdPartySW.bat
@@ -11,7 +11,8 @@ set thirdpartyGeneration=%1
 set buildType=%2
 set wxStable=%3
 
-set urlCreatisSource=http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source
+:: set urlCreatisSource=http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source
+set urlCreatisSource=http://www.creatis.insa-lyon.fr/~caceres/software
 
 if %PROCESSOR_ARCHITECTURE%==x86 (
   set ProgramFilesPath_x86=%ProgramFiles%
@@ -69,8 +70,8 @@ set BOOSTFNAME=boost_1_49_0.7z
 set XERCESFNAME=xerces-c-3.1.1.zip
 set ITKFNAME=InsightToolkit-3.20.1.zip
 set VTKFNAME=vtk-5.10.0.zip
-::set GDCMFNAME=gdcm_11_Oct_2011.tar.gz
-set GDCMFNAME=gdcm_05_Mai_2011.tar
+set GDCMFNAME=gdcm_11_Oct_2011.tar
+::set GDCMFNAME=gdcm_05_Mai_2011.tar
 set TTHFNAME=tth_exe.zip
 set JOMFNAME=jom.zip
 
@@ -162,6 +163,16 @@ cd %sourcepath%
 %zipPath% x %sourcepath%\%VTKFNAME%
 del %sourcepath%\%VTKFNAME%
 
+echo -----------------------------------
+echo ------------GDCM ------------------
+echo -----------------------------------
+
+cd %sourcepath%
+%zipPath% x %GDCMFNAME%.gz
+%zipPath% x %GDCMFNAME%
+del %GDCMFNAME%.gz
+del %GDCMFNAME%
+
 echo -----------------------------------
 echo -------------ITK-------------------
 echo -----------------------------------
@@ -178,16 +189,6 @@ cd %sourcepath%
 %zipPath% x %XERCESFNAME%
 del %XERCESFNAME%
 
-echo -----------------------------------
-echo ------------GDCM ------------------
-echo -----------------------------------
-
-cd %sourcepath%
-%zipPath% x %GDCMFNAME%.gz
-%zipPath% x %GDCMFNAME%
-del %GDCMFNAME%.gz
-del %GDCMFNAME%
-
 echo -----------------------------------
 echo --------------TTH------------------
 echo -----------------------------------
@@ -215,5 +216,28 @@ rename xerces-c-3.1.1 xerces
 
 echo -----End of Download Libraries-----
 echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
 
 exit /B
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat b/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat
index a6260985cee00810729e36e8bda3ac4b8cf99bca..cef5541d07bdb6b0c0d50fc1a38da0f9b795ac98 100644 (file)
--- a/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat
+++ b/Install_ThirdParty/scripts/generateThirdPartyLibExe.bat
@@ -2,13 +2,14 @@
 
 set thirdpartyGeneration=%1
 set buildType=%2
+set x86Comp=%3
 
 echo Calling move_thirdparty_libraries.bat
 
-call move_thirdparty_libraries.bat %thirdpartyGeneration% %buildType% >> generateThirdpartyLibExe.log 2>&1
+call move_thirdparty_libraries.bat %thirdpartyGeneration% %buildType% %x86Comp% >> generateThirdpartyLibExe.log 2>&1
 
 echo Calling install_thirdparty_libraries_cmake.bat
 
-call install_thirdparty_libraries_cmake.bat  %thirdpartyGeneration% %buildType% >> generateThirdpartyLibExe.log 2>&1
+call install_thirdparty_libraries_cmake.bat  %thirdpartyGeneration% %buildType% %x86Comp% >> generateThirdpartyLibExe.log 2>&1
 
 exit
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat b/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
index cb61a8b830f0919060db54aa8e50fa555a6fb353..71ef1ffb8ba5c49a622ea5537f65994ac2b44f95 100644 (file)
--- a/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
+++ b/Install_ThirdParty/scripts/generateThirdPartydllsExe.bat
@@ -2,13 +2,14 @@
 
 set thirdpartyGeneration=%1
 set buildType=%2
+set x86Comp=%3
 
 echo Calling move_thirdparty_dlls.bat
 
-call move_thirdparty_dlls.bat %thirdpartyGeneration% %buildType% >> generateThirdpartydllsExe.log 2>&1
+call move_thirdparty_dlls.bat %thirdpartyGeneration% %buildType% %x86Comp% >> generateThirdpartydllsExe.log 2>&1
 
 echo Calling install_thirdparty_dlls_cmake.bat
 
-call install_thirdparty_dlls_cmake.bat  %thirdpartyGeneration% %buildType% >> generateThirdpartydllsExe.log 2>&1
+call install_thirdparty_dlls_cmake.bat  %thirdpartyGeneration% %buildType% %x86Comp% >> generateThirdpartydllsExe.log 2>&1
 
 exit
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index eb77577a7c2662ad8445509ecdfdb8e6fe49f529..3ddd0781183c86f939054d876763588a1a99ae3e 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -91,8 +91,6 @@ if %x86Comp%==ON (
        )
 )
 
-goto next
-
 echo -----------------------------------
 echo --------Qt Installation------------
 echo -----------------------------------
@@ -102,7 +100,6 @@ set QMAKESPEC=win32-msvc2010
 echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
 
 %JOMDIR%\jom.exe -j %NUMBER_OF_PROCESSORS%
-%JOMDIR%\jom.exe clean
 
 cd C:\
 
@@ -111,12 +108,12 @@ echo -----wxWidgets Installation--------
 echo -----------------------------------
 cd %WXDIR%\build\msw
 if %x86Comp%==ON (
-       nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1
+       nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1 USE_OPENGL=1
 ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
-               nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1
+               nmake -f makefile.vc BUILD=%buildType% UNICODE=0 SHARED=1 USE_OPENGL=1
        ) else (
-               nmake -f makefile.vc TARGET_CPU=AMD64 BUILD=release UNICODE=0 SHARED=1
+               nmake -f makefile.vc TARGET_CPU=AMD64 BUILD=release UNICODE=0 SHARED=1 USE_OPENGL=1
        )
 )
 cd C:\
@@ -133,17 +130,16 @@ cd %sourcepath%\%boost%
 call bootstrap.bat
 
 if %x86Comp%==ON (
-       bjam.exe -j %NUMBER_OF_PROCESSORS% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared --prefix=%installpath%\%boost% install
+       bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install
 ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
-               bjam.exe -j %NUMBER_OF_PROCESSORS% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared --prefix=%installpath%\%boost% install
+               bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install
        ) else (
-               bjam.exe -j %NUMBER_OF_PROCESSORS% --toolset=msvc-10.0 address-model=64 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=    shared --prefix=%installpath%\%boost% install
+               bjam.exe -j %NUMBER_OF_PROCESSORS% --prefix=%installpath%\%boost% --toolset=msvc-10.0 architecture=x86 address-model=64 --build-type=complete --build-dir=%binpath%\%boost%Bin --link=shared --runtime-link=shared install
        )
 )
 cd C:\
 
-:next
 echo -----------------------------------
 echo -------VTK Installation------------
 echo -----------------------------------
@@ -165,11 +161,12 @@ if %x86Comp%==ON (
 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%vtk%\ CMakeCache.txt
 cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
 cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /target:ALL_BUILD /p:Platform=AnyCPU ;UseEnv=true;BuildInParallel=true;Configuration=%buildType%
-msbuild /m:%NUMBER_OF_PROCESSORS% /p:Platform=AnyCPU ;UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /target:ALL_BUILD /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% INSTALL.vcxproj
 
 cd c:\
 
+
 echo -----------------------------------
 echo -------GDCM Installation-----------
 echo -----------------------------------
@@ -190,13 +187,14 @@ if %x86Comp%==ON (
 )
 
 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%gdcm%\ CMakeCache.txt
-cmake -D VTK_DIR:PATH=%installpath%\%vtk%\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
+cmake -D VTK_DIR:PATH=%binpath%\%vtk%Bin\ -D GDCM_VTK:BOOL=ON -D BUILD_TESTING:BOOL=OFF -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
 cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Platform=AnyCPU;Configuration=%buildType%
-msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Platform=AnyCPU;Configuration=%buildType%
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
 
 cd c:\
 
+
 echo -----------------------------------
 echo -------ITK Installation------------
 echo -----------------------------------
@@ -217,8 +215,8 @@ if %x86Comp%==ON (
 cmake -D USE_DEBUG_LIB:BOOL=%buildType% -D CMAKE_INSTALL_PREFIX:PATH=%installpath%\%itk%\ CMakeCache.txt
 cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
 cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Platform=AnyCPU;Configuration=%buildType%
-msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Platform=AnyCPU;Configuration=%buildType%
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
 
 cd c:\
 
@@ -226,12 +224,36 @@ echo -----------------------------------
 echo ------XERCES Installation----------
 echo -----------------------------------
 cd  %sourcepath%\%xercesc%\projects\Win32\VC10\xerces-all
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Platform=AnyCPU;Configuration=%buildType%
-FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Platform=AnyCPU;Configuration=%buildType%
-msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Platform=AnyCPU;Configuration=%buildType%
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
+msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
 
 echo -----------------------------------
 echo ---End of Installing Libraries-----
 echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
+echo -----------------------------------
 
 exit /B
\ No newline at end of file

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index 2e791bfd03c414963e46751a714e309c4e9f7ec7..cb2116f1e74239b0c177cfaa1961a4882791f2c9 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -18,6 +18,8 @@ echo ----End Asking Architecture--------
 
 set thirdpartyGeneration=%1
 set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 
 set version="3.0.1-win32"
@@ -37,19 +39,28 @@ if not exist %vcvarsall% (
   exit
 )
 
-if %PROCESSOR_ARCHITECTURE%==x86 (
+if %x86Comp%==ON (
        call %vcvarsall%
+       echo "Compilation forced x86"
 ) else (
-       call %vcvarsall% amd64
+       if %PROCESSOR_ARCHITECTURE%==x86 (
+               call %vcvarsall%
+       ) else (
+               call %vcvarsall% amd64
+       )
 )
 
 mkdir %binpath%
 cd %binpath%
 
-if %PROCESSOR_ARCHITECTURE%==x86 (
+if %x86Comp%==ON (
        cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
 ) else (
-       cmake -G"Visual Studio 10 Win64"  -H%sourcepath% -B%binpath%
+       if %PROCESSOR_ARCHITECTURE%==x86 (
+               cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+       ) else (
+               cmake -G"Visual Studio 10 Win64"  -H%sourcepath% -B%binpath%
+       )
 )
 
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index cd24ef5c8bec4b4b4529ded35695d92ea98f989e..48da8b58bd616fe1c51f6ebe615dea54eeb75529 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -18,6 +18,8 @@ echo ----End Asking Architecture--------
 
 set thirdpartyGeneration=%1
 set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 set version="3.0.1-win32"
 
@@ -36,19 +38,28 @@ if not exist %vcvarsall% (
   exit
 )
 
-if %PROCESSOR_ARCHITECTURE%==x86 (
+if %x86Comp%==ON (
        call %vcvarsall%
+       echo "Compilation forced x86"
 ) else (
-       call %vcvarsall% amd64
+       if %PROCESSOR_ARCHITECTURE%==x86 (
+               call %vcvarsall%
+       ) else (
+               call %vcvarsall% amd64
+       )
 )
 
 mkdir %binpath%
 cd %binpath%
 
-if %PROCESSOR_ARCHITECTURE%==x86 (
+if %x86Comp%==ON (
        cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
 ) else (
-       cmake -G"Visual Studio 10 Win64"  -H%sourcepath% -B%binpath%
+       if %PROCESSOR_ARCHITECTURE%==x86 (
+               cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+       ) else (
+               cmake -G"Visual Studio 10 Win64"  -H%sourcepath% -B%binpath%
+       )
 )
 
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt

diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
index 5c6da0f1514602f17c6fde9f4a9092b58a934114..0fc484cd5cdd597dd2a55337234eaa87fa7ffcea 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat
@@ -44,8 +44,8 @@ mkdir %creaThirdPartydlls%
 echo setting buildtype libraries
 echo if(%buildType%=="release")(
        set qtBtype=4
-       set wxPrefixBase=wxbase293
-       set wxPrefixmsw=wxmsw293
+       set wxPrefixBase=wxbase28
+       set wxPrefixmsw=wxmsw28
        set boostMT=-vc100-mt-1_49.dll
        set boostMTGD=-vc100-mt-gd-1_49.dll
 echo ) else (
@@ -54,6 +54,15 @@ echo set wxPrefixBase=wxbase293d
 echo   set wxPrefixmsw=wxmsw293d
 echo )
 
+
+if %PROCESSOR_ARCHITECTURE%==x86  (
+       set vcFolder=vc_dll
+       set winType=Win32
+) else (
+       set vcFolder=vc_amd64_dll
+       set winType=Win64
+)
+
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
@@ -101,18 +110,18 @@ echo -------------wxWidgets-------------
 echo -----------------------------------
 
 
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_xml_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_adv_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_aui_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_core_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_gl_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_html_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_media_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_qa_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_richtext_vc_custom.dll %creaThirdPartydlls%
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_xrc_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_adv_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_aui_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_core_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_gl_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_html_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_media_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_qa_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_richtext_vc_custom.dll %creaThirdPartydlls%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_xrc_vc_custom.dll %creaThirdPartydlls%
 
 
 echo -----------------------------------
@@ -153,7 +162,7 @@ echo -----------------------------------
 echo -------------Xcerces---------------
 echo -----------------------------------
 
-copy /V /Y %XERCESDIR%\Build\Win32\VC10\Release\xerces-c_3_1.dll %creaThirdPartydlls%
+copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3_1.dll %creaThirdPartydlls%
 
 echo -----------------------------------
 echo -------------ITK-------------------

diff --git a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
index 542af4010682f9766de3cf2180e943a50fc16fb4..8865a55a7d7c74f39c226ca46704a6d121303c03 100644 (file)
--- a/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
+++ b/Install_ThirdParty/scripts/move_thirdparty_libraries.bat
@@ -65,8 +65,8 @@ if not exist %MIKTEXPFDIR% (
 
 echo if(%buildType%==release)(
        set qtBtype=4
-       set wxPrefixBase=wxbase29
-       set wxPrefixmsw=wxmsw29
+       set wxPrefixBase=wxbase28
+       set wxPrefixmsw=wxmsw28
        set boostMT=-vc100-mt-1_49.lib
        set boostMTGD=-vc100-mt-gd-1_49.lib
        set boostMTS=-vc100-mt-s-1_49.lib
@@ -77,6 +77,14 @@ echo         set wxPrefixBase=wxbase293d
 echo   set wxPrefixmsw=wxmsw293d
 echo )
 
+if %PROCESSOR_ARCHITECTURE%==x86  (
+       set vcFolder=vc_dll
+       set winType=Win32
+) else (
+       set vcFolder=vc_amd64_dll
+       set winType=Win64
+)
+
 echo -----------------------------------
 echo Environment variables Configuration
 echo -----------------------------------
@@ -176,29 +184,29 @@ 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\
 
-mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixBase%_xml.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_adv.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_aui.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_core.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_html.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_media.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\%wxPrefixmsw%_xrc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxexpat.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-copy /V /Y %WXDIR%\lib\vc_dll\wxregex.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll
-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\msw
-
-XCOPY %WXDIR%\lib\vc_dll\msw\* %creaThirdPartyLibraries%\%wxWidgets%\lib\vc_dll\msw /s /i
+mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_net.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixBase%_xml.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_adv.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_aui.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_core.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_html.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_media.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_qa.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_richtext.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\%wxPrefixmsw%_xrc.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxexpat.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxjpeg.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxpng.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxregex.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxtiff.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+copy /V /Y %WXDIR%\lib\%vcFolder%\wxzlib.lib %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%
+
+mkdir %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\msw
+
+XCOPY %WXDIR%\lib\%vcFolder%\msw\* %creaThirdPartyLibraries%\%wxWidgets%\lib\%vcFolder%\msw /s /i
 
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\jpeg
 mkdir %creaThirdPartyLibraries%\%wxWidgets%\src\png
@@ -321,7 +329,7 @@ mkdir %creaThirdPartyLibraries%\%xercesc%\lib\
 
 XCOPY %XERCESDIR%\src\* %creaThirdPartyLibraries%\%xercesc%\include\ /s /i
 
-copy /V /Y %XERCESDIR%\Build\Win32\VC10\Release\xerces-c_3.lib %creaThirdPartyLibraries%\%xercesc%\lib\
+copy /V /Y %XERCESDIR%\Build\%winType%\VC10\Release\xerces-c_3.lib %creaThirdPartyLibraries%\%xercesc%\lib\
 
 
 echo -----------------------------------