DFCH: Compiler updates

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

diff --git a/Install/scripts/compilemod.bat b/Install/scripts/compilemod.bat
index a25d2298ad3aecd7df5343e3e89d80d1235ca261..382d4b513370cd3ba77bf7d1b267a5ac73d20361 100644 (file)
--- a/Install/scripts/compilemod.bat
+++ b/Install/scripts/compilemod.bat
@@ -1,9 +1,45 @@
-REM %1=buildtype  %2=<Module Sources Ex crea bbtk creaMaracasVisu ...>
-
-cd %2Bin
-call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%1
-FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 INSTALL.vcproj
-FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj
-copy %2*.exe ../Result_Installers/
-cd ..
+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\%2Bin
+
+cd %binfolder%
+if %compilerVersion%=="Visual Studio 10"
+(
+       FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%1
+       msbuild /p:Configuration=%1 ALL_BUILD.vcxproj
+       msbuild /p:Configuration=%1 INSTALL.vcxproj
+       msbuild /p:Configuration=%1 PACKAGE.vcxproj
+       copy %2*.exe %3\Result_Installers\
+)
+else
+(
+       FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%1
+       msbuild /p:Configuration=%1 INSTALL.vcproj
+       msbuild /p:Configuration=%1 PACKAGE.vcproj
+       copy %2*.exe %3\Result_Installers\
+)