From 118cd2c6d842dd4814ef8cd135477a6581f9e851 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Mon, 23 Apr 2018 17:26:54 +0200 Subject: [PATCH] tools: Only create solutions for Visual Studio 2017 (Windows) --- tools/make-solutions.bat | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/tools/make-solutions.bat b/tools/make-solutions.bat index 508b264..3813bf2 100644 --- a/tools/make-solutions.bat +++ b/tools/make-solutions.bat @@ -8,34 +8,14 @@ SET "DEPSPATH=%CD%/deps/obs" :: Compilers SET COMPILER#=0 SET /A COMPILER#=COMPILER#+1 -SET "COMPILER[%COMPILER#%]=Visual Studio 12 2013" -SET "DISTRIB[%COMPILER#%]=%CD%/vs-2013-distrib" -SET "PATH[%COMPILER#%]=%CD%/vs-2013-32" -SET "TOOLSET[%COMPILER#%]=" -SET /A COMPILER#=COMPILER#+1 -SET "COMPILER[%COMPILER#%]=Visual Studio 12 2013 Win64" -SET "DISTRIB[%COMPILER#%]=%CD%/vs-2013-distrib" -SET "PATH[%COMPILER#%]=%CD%/vs-2013-64" -SET "TOOLSET[%COMPILER#%]=host=x64" -SET /A COMPILER#=COMPILER#+1 -SET "COMPILER[%COMPILER#%]=Visual Studio 14 2015" -SET "DISTRIB[%COMPILER#%]=%CD%/vs-2015-distrib" -SET "PATH[%COMPILER#%]=%CD%/vs-2015-32" -SET "TOOLSET[%COMPILER#%]=" -SET /A COMPILER#=COMPILER#+1 -SET "COMPILER[%COMPILER#%]=Visual Studio 14 2015 Win64" -SET "DISTRIB[%COMPILER#%]=%CD%/vs-2015-distrib" -SET "PATH[%COMPILER#%]=%CD%/vs-2015-64" -SET "TOOLSET[%COMPILER#%]=host=x64" -SET /A COMPILER#=COMPILER#+1 SET "COMPILER[%COMPILER#%]=Visual Studio 15 2017" -SET "DISTRIB[%COMPILER#%]=%CD%/vs-2017-distrib" -SET "PATH[%COMPILER#%]=%CD%/vs-2017-32" +SET "DISTRIB[%COMPILER#%]=%CD%/vs2017-distrib" +SET "PATH[%COMPILER#%]=%CD%/vs2017-32" SET "TOOLSET[%COMPILER#%]=" SET /A COMPILER#=COMPILER#+1 SET "COMPILER[%COMPILER#%]=Visual Studio 15 2017 Win64" -SET "DISTRIB[%COMPILER#%]=%CD%/vs-2017-distrib" -SET "PATH[%COMPILER#%]=%CD%/vs-2017-64" +SET "DISTRIB[%COMPILER#%]=%CD%/vs2017-distrib" +SET "PATH[%COMPILER#%]=%CD%/vs2017-64" SET "TOOLSET[%COMPILER#%]=host=x64" FOR /L %%i IN (1,1,%COMPILER#%) DO ( @@ -45,3 +25,4 @@ FOR /L %%i IN (1,1,%COMPILER#%) DO ( cmake -G "!COMPILER[%%i]!" -T "!TOOLSET[%%i]!" --target INSTALL -DPATH_OBSStudio="%DEPSPATH%" -DINSTALL_DIR="!DISTRIB[COMPILER[%%i]!" ../../ popd ) +PAUSE \ No newline at end of file