@echo off
echo -----------------------------------
+echo -----Generating Installers of------
+echo -------creaThirdPartyDlls----------
+echo -----------------------------------
+echo -----------------------------------
echo ------Asking Architecture----------
echo -----------------------------------
if %PROCESSOR_ARCHITECTURE%==x86 (
echo ----End Asking Architecture--------
+set thirdpartyGeneration=%1
+set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
-set thirdpartydllspath=%1
set thirdparty_cmake=%cd%\..\cmake
set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+set thirdpartydllspath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls
set sourcepath=%thirdparty_cmake%\crea_ThirdParty_dlls
-set binpath=%thirdparty_cmake%\crea_ThirdParty_dlls_Bin
-set installpath="C:\Temp\creatools\crea_ThirdParty_dlls"
-echo set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls"
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\crea_ThirdParty_dlls_Bin
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%
+ set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls"
+ echo "Compilation forced x86"
+) else (
+ if %PROCESSOR_ARCHITECTURE%==x86 (
+ call %vcvarsall%
+ set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls"
+ ) else (
+ call %vcvarsall% amd64
+ set installpath="%ProgramFiles%\creatools\crea_ThirdParty_dlls"
+ )
+)
+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_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt
cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
-msbuild /p:Configuration=release INSTALL.vcxproj
-@echo on
\ No newline at end of file
+
+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
+
+exit /B
\ No newline at end of file