X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Fmove_thirdparty_dlls.bat;h=0b3c0f34dc7f7ff9521a77f16550a6db5673e19f;hb=0613d094f03ceaa9e5982f0ad11e1c7d9a064baa;hp=ffaafb22be54eb6f3068dd810f168f23ee5276b4;hpb=fe74e564442e8ec3d00428ece42c16138f51738c;p=creaToolsTools.git diff --git a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat index ffaafb2..0b3c0f3 100644 --- a/Install_ThirdParty/scripts/move_thirdparty_dlls.bat +++ b/Install_ThirdParty/scripts/move_thirdparty_dlls.bat @@ -1,26 +1,3 @@ -REM --------------------------------------------------------------------- -REM -REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -REM pour la Santé) -REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton -REM -REM This software is governed by the CeCILL-B license under French law and -REM abiding by the rules of distribution of free software. You can use, -REM modify and/ or redistribute the software under the terms of the CeCILL-B -REM license as circulated by CEA, CNRS and INRIA at the following URL -REM http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -REM or in the file LICENSE.txt. -REM -REM As a counterpart to the access to the source code and rights to copy, -REM modify and redistribute granted by the license, users are provided only -REM with a limited warranty and the software's author, the holder of the -REM economic rights, and the successive licensors have only limited -REM liability. -REM -REM The fact that you are presently reading this means that you have had -REM knowledge of the CeCILL-B license and that you accept its terms. -REM ------------------------------------------------------------------------ - @echo off echo ----------------------------------- echo ----------Moving Dlls-------------- @@ -67,7 +44,7 @@ rmdir /S /Q %creaThirdPartydlls% mkdir %creaThirdPartydlls% echo setting buildtype libraries -echo if(%buildType%=="release")( +if %buildType%==release ( set qtBtype=4 set wxPrefixBase=wxbase28 set wxPrefixmsw=wxmsw28 @@ -96,12 +73,14 @@ if %x86Comp%==ON ( echo ----------------------------------- echo Environment variables Configuration echo ----------------------------------- +echo buildType=%buildType% echo ThirdpartyGeneration=%thirdpartyGeneration% echo InstallPath=%installpath% echo BinPath=%binpath% echo SourcePath=%sourcepath% echo creaThirdPartyLibraries=%thirdpartyInstallPath%\creaThirdParty_libraries echo QT=%qt% +echo qtBtype=%qtBtype% echo WX=%wxWidgets% echo BOOST=%boost% echo Xercesc=%xercesc% @@ -156,8 +135,10 @@ echo ----------------------------------- echo -------------Boost----------------- echo ----------------------------------- -set boostMT=-vc100-mt-1_49.dll -set boostMTGD=-vc100-mt-gd-1_49.dll +REM set boostMT=-vc100-mt-1_49.dll +REM set boostMTGD=-vc100-mt-gd-1_49.dll +set boostMT=-vc100-mt-1_52.dll +set boostMTGD=-vc100-mt-gd-1_52.dll copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMT% %creaThirdPartydlls% copy /V /Y %BOOSTINSTALLDIR%\lib\boost_date_time%boostMTGD% %creaThirdPartydlls%