X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install%2Fscripts%2Fcompilemod.bat;h=d046704e47effc3a18f5000db91c62e0ebb40861;hb=2c6851a7c02b50273597ddf89912f5b3bfc86f8e;hp=beda3fbbdaccf467bfce153edc9ea00ecf7861f8;hpb=e95400057316f6be2396a05bfcad35f676b5452d;p=creaToolsTools.git

diff --git a/Install/scripts/compilemod.bat b/Install/scripts/compilemod.bat
index beda3fb..d046704 100644
--- a/Install/scripts/compilemod.bat
+++ b/Install/scripts/compilemod.bat
@@ -2,11 +2,41 @@ 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%
-call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
-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\
+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\
+)