From 2c6851a7c02b50273597ddf89912f5b3bfc86f8e Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Mon, 19 Dec 2011 17:32:51 +0000 Subject: [PATCH] DFCH: Compiler updates --- Install/scripts/compilemod.bat | 9 +++------ Install/scripts/compilemodCreaTools.bat | 10 +++------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Install/scripts/compilemod.bat b/Install/scripts/compilemod.bat index 382d4b5..d046704 100644 --- a/Install/scripts/compilemod.bat +++ b/Install/scripts/compilemod.bat @@ -5,8 +5,7 @@ REM %3 = if %PROCESSOR_ARCHITECTURE%==x86 ( set ProgramFilesPath_x86=%ProgramFiles% echo "Architecture found = x86" -) else -( +) else ( set "ProgramFilesPath_x86=%ProgramFiles(x86)%" echo "Architecture found = x64" ) @@ -28,16 +27,14 @@ call %vcvarsall% set binfolder=%3\creatools_bin\%2Bin cd %binfolder% -if %compilerVersion%=="Visual Studio 10" -( +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 -( +else ( FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%1 msbuild /p:Configuration=%1 INSTALL.vcproj msbuild /p:Configuration=%1 PACKAGE.vcproj diff --git a/Install/scripts/compilemodCreaTools.bat b/Install/scripts/compilemodCreaTools.bat index 810e4ac..426d5bd 100644 --- a/Install/scripts/compilemodCreaTools.bat +++ b/Install/scripts/compilemodCreaTools.bat @@ -5,8 +5,7 @@ REM %3 = if %PROCESSOR_ARCHITECTURE%==x86 ( set ProgramFilesPath_x86=%ProgramFiles% echo "Architecture found = x86" -) else -( +) else ( set "ProgramFilesPath_x86=%ProgramFiles(x86)%" echo "Architecture found = x64" ) @@ -29,13 +28,10 @@ set binfolder=%3\creatools_bin\%1Bin cd %binfolder% -if %compilerVersion%=="Visual Studio 10" -( +if %compilerVersion%=="Visual Studio 10" ( FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcxproj copy %2*.exe %3\Result_Installers\ -) -else -( +) else ( FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj copy %2*.exe %3\Result_Installers\ ) -- 2.45.0