DFCH: Compiler updates

[creaToolsTools.git] / Install / scripts / compilemodCreaTools.bat

diff --git a/Install/scripts/compilemodCreaTools.bat b/Install/scripts/compilemodCreaTools.bat
index 8333bf812c68335d7388ec2d33540c5c44ec62ee..810e4ac3899aad24deef2590222506b051f423f4 100644 (file)
--- a/Install/scripts/compilemodCreaTools.bat
+++ b/Install/scripts/compilemodCreaTools.bat
@@ -2,9 +2,40 @@ REM %1 = <buildtype>
 REM %2 = <Module Sources Ex crea bbtk creaMaracasVisu ...>
 REM %3 = <creatoolsGeneration>
 
+if %PROCESSOR_ARCHITECTURE%==x86 (
+  set ProgramFilesPath_x86=%ProgramFiles%
+  echo "Architecture found = x86"
+) else
+(
+  set "ProgramFilesPath_x86=%ProgramFiles(x86)%"
+  echo "Architecture found = x64"
+)
+set compilerVersion="Visual Studio 10"
+set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+if not exist %vcvarsall% set vcvarsall="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+if not exist %vcvarsall% (
+  set compilerVersion="Visual Studio 9 2008"
+  set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+  if not exist %vcvarsall% set vcvarsall="%ProgramFilesPath_x64%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+  if not exist %vcvarsall% (
+    echo ERROR!!! Visual Studio has not been found in the system
+    exit
+  )
+)
+
+call %vcvarsall%
+
 set binfolder=%3\creatools_bin\%1Bin
 
 cd %binfolder%
-call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
-FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj
-copy %2*.exe %3\Result_Installers\
+
+if %compilerVersion%=="Visual Studio 10"
+(
+  FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcxproj
+  copy %2*.exe %3\Result_Installers\
+)
+else
+(
+  FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj
+  copy %2*.exe %3\Result_Installers\
+)