set thirdpartyGeneration=%1
set buildType=%2
-
-set version="3.0.1-win32"
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
set thirdparty_cmake=%cd%\..\cmake
set thirdpartylibpath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries
set sourcepath=%thirdparty_cmake%\crea_ThirdParty_Libraries
set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\creaTPLBin
-set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries"
if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
if not exist %vcvarsall% (
exit
)
-call %vcvarsall%
+if %x86Comp%==ON (
+ call %vcvarsall%
+ echo "Compilation forced x86"
+) else (
+ if %PROCESSOR_ARCHITECTURE%==x86 (
+ set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_Libraries"
+ call %vcvarsall%
+ ) else (
+ set installpath="%ProgramFiles%\creatools\crea_ThirdParty_Libraries"
+ call %vcvarsall% amd64
+ )
+)
+rmdir /S /Q %binpath%
mkdir %binpath%
cd %binpath%
-cmake -G"Visual Studio 10" -H%sourcepath% -B%binpath%
+if %x86Comp%==ON (
+ set buildPlatform=win32
+ cmake -G"Visual Studio 10" -H%sourcepath% -B%binpath%
+) else (
+ if %PROCESSOR_ARCHITECTURE%==x86 (
+ set buildPlatform=win32
+ cmake -G"Visual Studio 10" -H%sourcepath% -B%binpath%
+ ) else (
+ set buildPlatform=win64
+ cmake -G"Visual Studio 10 Win64" -H%sourcepath% -B%binpath%
+ )
+)
+
+cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform% CMakeCache.txt
cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt
cmake -D CREA_LIBRARY_SOURCE_PATH:PATH=%thirdpartylibpath% CMakeCache.txt
cmake CMakeCache.txt
FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% PACKAGE.vcxproj
-set installerPath="%thirdpartydllspath%\thirdparty_bin\creaTPLBin\crea_ThirdParty_Libraries-%version%.exe"
-
-if exist installerPath (
-mkdir %thirdpartyGeneration%\thirdparty_installers
-move /Y %installerPath% %thirdpartyGeneration%\thirdparty_installers
-)
-
exit /B
\ No newline at end of file