DFCH: Stable Version of creaThirdPartyLibraries

[creaToolsTools.git] / Install_ThirdParty / scripts / install_thirdparty_all.bat

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index bd8a5ee2c8c8b9033c668289a09501932542bce6..ff08b8363bd2fd0857fdd7790e6e082de7effa07 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -38,11 +38,15 @@ if not exist %vcvarsall% (
   echo ERROR!!! Visual Studio has not been found in the system
   exit
 )
-if not exist %miktex% set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
+
 if not exist %miktex% (
+ set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
+ if not exist %miktex% (
   echo ERROR!!! MiKTex has not been found in the system
   exit
+ )
 )
+
 if not exist %wgetPath% (
   echo ERROR!!! wget has not been found in the system
   exit
@@ -151,12 +155,7 @@ echo ----------Installing---------------
 
 cd %QTDIR%
 
-
-if %PROCESSOR_ARCHITECTURE%==x86 (
 echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
-) else (
-echo y | configure -%buildType% -opensource -shared -qt-sql-sqlite -phonon -phonon-backend -platform win32-msvc2010 -mp
-)
 
 nmake
 cd C:\
@@ -199,18 +198,7 @@ echo ----------Installing---------------
 
 cd %sourcepath%\%boost%
 call bootstrap.bat
-
-if %PROCESSOR_ARCHITECTURE%==x86 (
-
-  b2.exe --toolset=msvc-10.0 --build-type=complete stage
-
-) else (
-
-cd stage
-  b2.exe --toolset=msvc-10.0 --build-type=complete architecture=x86 address-model=64 stage
-
-)
-
+b2.exe --toolset=msvc-10.0 --build-type=complete stage
 cd C:\
 
 echo -----End Boost Installation--------