diff --git a/tools/make-solutions.bat b/tools/make-solutions.bat index 3813bf2..1c59122 100644 --- a/tools/make-solutions.bat +++ b/tools/make-solutions.bat @@ -9,20 +9,22 @@ SET "DEPSPATH=%CD%/deps/obs" SET COMPILER#=0 SET /A COMPILER#=COMPILER#+1 SET "COMPILER[%COMPILER#%]=Visual Studio 15 2017" -SET "DISTRIB[%COMPILER#%]=%CD%/vs2017-distrib" -SET "PATH[%COMPILER#%]=%CD%/vs2017-32" SET "TOOLSET[%COMPILER#%]=" +SET "PATH[%COMPILER#%]=%CD%/vs2017-32" +SET "DISTRIB[%COMPILER#%]=%CD%/vs2017-distrib" +SET "SYSTEM[%COMPILER#%]=win32" SET /A COMPILER#=COMPILER#+1 SET "COMPILER[%COMPILER#%]=Visual Studio 15 2017 Win64" -SET "DISTRIB[%COMPILER#%]=%CD%/vs2017-distrib" -SET "PATH[%COMPILER#%]=%CD%/vs2017-64" SET "TOOLSET[%COMPILER#%]=host=x64" +SET "PATH[%COMPILER#%]=%CD%/vs2017-64" +SET "DISTRIB[%COMPILER#%]=%CD%/vs2017-distrib" +SET "SYSTEM[%COMPILER#%]=win64" FOR /L %%i IN (1,1,%COMPILER#%) DO ( ECHO -- BUILD FOR "!COMPILER[%%i]!" -- mkdir "!PATH[%%i]!" pushd "!PATH[%%i]!" - cmake -G "!COMPILER[%%i]!" -T "!TOOLSET[%%i]!" --target INSTALL -DPATH_OBSStudio="%DEPSPATH%" -DINSTALL_DIR="!DISTRIB[COMPILER[%%i]!" ../../ + cmake -G "!COMPILER[%%i]!" -T "!TOOLSET[%%i]!" -DCMAKE_INSTALL_PREFIX="!DISTRIB[%%i]!" -DCPACK_SYSTEM_NAME="!SYSTEM[%%i]!" ../../ popd ) PAUSE \ No newline at end of file