X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2Fbase%2Fcompilemod.bat;h=c7a3c835ad16846a7d221de237448148aa50c599;hb=3e1fe2cc17634ebb2ad535a71ac331ec3c6faa02;hp=1ae7c027a99ec47852f7ef806e85ea473d5c55cf;hpb=c6a324a9e343fcd992fc3e73e886bc0323d5c0a7;p=creaToolsTools.git

diff --git a/Install/scripts/base/compilemod.bat b/Install/scripts/base/compilemod.bat
index 1ae7c02..c7a3c83 100644
--- a/Install/scripts/base/compilemod.bat
+++ b/Install/scripts/base/compilemod.bat
@@ -46,7 +46,7 @@ if not exist %vcvarsall% (
   exit
 )
 
-if %forcex86%==ON (
+if %platforme%==Win32 (
 	call %vcvarsall%
 	set "compilerVersion=Visual Studio 10"
 	echo "Compilation forced x86"
@@ -58,12 +58,11 @@ if %forcex86%==ON (
 	)
 )
 
-
-set binfolder=%3\creatools_bin\%2Bin
+set binfolder=%3\creatools_%buildtype%%platforme%\creatools_bin\%2Bin
 cd %binfolder%
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:UseEnv=true;BuildInParallel=true;Configuration=%1
-msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 ALL_BUILD.vcxproj
+REM FOR /R %%a IN (*.sln) DO msbuild %%a /p:UseEnv=true;BuildInParallel=true;Configuration=%1
+REM msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 ALL_BUILD.vcxproj
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 INSTALL.vcxproj
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%1 PACKAGE.vcxproj
-copy %2*.exe %3\Result_Installers\
+copy %2*.exe %3\creatools_%buildtype%%platforme%\Result_Installers\
 exit /B
\ No newline at end of file