From 5ed8289ffa9643c12d6d22f4829aa131018e9dcc Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 24 Apr 2013 15:16:12 +0200 Subject: [PATCH] EED --- .../scripts/creaTools/creaToolsVariables.bat | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/Install/scripts/creaTools/creaToolsVariables.bat b/Install/scripts/creaTools/creaToolsVariables.bat index 39dd16d..cbe87d8 100644 --- a/Install/scripts/creaTools/creaToolsVariables.bat +++ b/Install/scripts/creaTools/creaToolsVariables.bat @@ -26,10 +26,19 @@ echo ---------------------------- echo ---creaToolVariables.bat---- echo ---------------------------- -echo creatoolsGeneration = %1 -echo creatoolssource = %2 -echo docgeneration = %3 -echo buildType = %4 +set creatoolsGeneration=%1 +set creatoolssource=%2 +set docgeneration=%3 +set buildType=%4 +set forcex86=%5 + +echo creatoolsGeneration = %creatoolsGeneration% +echo creatoolssource = %creatoolssource% +echo docgeneration = %docgeneration% +echo buildType = %buildType% +echo forcex86 = %forcex86% + + set binfolder=%1\creatools_bin\%2Bin cd %binfolder% @@ -38,4 +47,15 @@ IF %4==Debug ( cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt ) -cmake -D CREATOOLS_BUILDTYPE:STRING="%4" -D CREATOOLS_SOURCE_PATH:PATH=%1\creatools_install CMakeCache.txt +if %forcex86%==ON ( + set buildPlatform=win32 +) else ( + if %PROCESSOR_ARCHITECTURE%==x86 ( + set buildPlatform=win32 + ) else ( + set buildPlatform=win64 + ) +) + +cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform% CMakeCache.txt +cmake -D CREATOOLS_SOURCE_PATH:PATH=%creatoolsGeneration%\creatools_install CMakeCache.txt -- 2.44.0