added: support for vs2015 to build scripts

support/build-cmake.cmd

@@ -5,17 +5,36 @@ SETLOCAL
 rem set paths
 SET BASEDIR=%CD%\..
 SET BUILDDIR=%2
+SET TOOLCHAIN32=""
+SET TOOLCHAIN64=""
+
+IF "%3" == "14" (
+  SET TOOLCHAIN32="%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+  SET TOOLCHAIN64="%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
+  SET TOOLCHAIN_NAME=Visual Studio 14 2015
+)
+IF "%3" == "12" (
+  SET TOOLCHAIN32="%VS120COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+  SET TOOLCHAIN64="%VS120COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
+  SET TOOLCHAIN_NAME=Visual Studio 12 2015
+)
+IF %TOOLCHAIN32% == "" (
+  echo Toolchain not set
+  GOTO END
+)
 
 rem set Visual C++ build environment
 IF "%1" == "amd64" (
   echo Compiling for win64
-  call "%VS120COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
+  call %TOOLCHAIN64%
 )
 IF NOT "%1" == "amd64" (
   echo Compiling for win32
-  call "%VS120COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+  call %TOOLCHAIN32%
 )
 
 rem go into the build directory
 CD "%BUILDDIR%"
-nmake install
+nmake install
+
+:END

support/build-platform.cmd

@@ -8,10 +8,10 @@ SET BUILDBASEDIR=%BASEDIR%\cmake-build
 SET BUILDTYPE=%2
 
 IF "%1" == "amd64" (
-  call generate-cmake.cmd amd64 nmake "%BASEDIR%\src\platform" "%BUILDBASEDIR%\buildplatform64" %BUILDTYPE% static
-  call build-cmake.cmd amd64 "%BUILDBASEDIR%\buildplatform64"
+  call generate-cmake.cmd amd64 nmake "%BASEDIR%\src\platform" "%BUILDBASEDIR%\buildplatform64" %BUILDTYPE% 14 static
+  call build-cmake.cmd amd64 "%BUILDBASEDIR%\buildplatform64" 14
 )
 IF NOT "%1" == "amd64" (
-  call generate-cmake.cmd x86 nmake "%BASEDIR%\src\platform" "%BUILDBASEDIR%\buildplatform" %BUILDTYPE% static
-  call build-cmake.cmd x86 "%BUILDBASEDIR%\buildplatform"
+  call generate-cmake.cmd x86 nmake "%BASEDIR%\src\platform" "%BUILDBASEDIR%\buildplatform" %BUILDTYPE% 14 static
+  call build-cmake.cmd x86 "%BUILDBASEDIR%\buildplatform" 14
 )

support/build.cmd

@@ -6,14 +6,14 @@ SET BUILDBASEDIR=%BASEDIR%\cmake-build
 
 rem build amd64
 call build-platform.cmd amd64 Release
-call generate-cmake.cmd amd64 nmake "%BASEDIR%" "%BUILDBASEDIR%\build64" Release
+call generate-cmake.cmd amd64 nmake "%BASEDIR%" "%BUILDBASEDIR%\build64" Release 14
 rem because of some bug in cmake, we touch this file or the build will fail
 cmake -E touch "%BUILDBASEDIR%\build64\src\libcec\libcec.py"
-call build-cmake.cmd amd64 "%BUILDBASEDIR%\build64"
+call build-cmake.cmd amd64 "%BUILDBASEDIR%\build64" 14
 
 rem build x86
 call build-platform.cmd x86 Release
-call generate-cmake.cmd x86 nmake "%BASEDIR%" "%BUILDBASEDIR%\build" Release
+call generate-cmake.cmd x86 nmake "%BASEDIR%" "%BUILDBASEDIR%\build" Release 14
 rem because of some bug in cmake, we touch this file or the build will fail
 cmake -E touch "%BUILDBASEDIR%\build\src\libcec\libcec.py"
-call build-cmake.cmd x86 "%BUILDBASEDIR%\build"
+call build-cmake.cmd x86 "%BUILDBASEDIR%\build" 14

support/generate-cmake.cmd

@@ -9,31 +9,48 @@ SET SCRIPTSDIR=%BASEDIR%\cmake
 SET PROJECT_DIR=%3
 SET BUILDDIR=%4
 SET BUILDTYPE=%5
+SET TOOLCHAIN32=""
+SET TOOLCHAIN64=""
+
+IF "%6" == "14" (
+  SET TOOLCHAIN32="%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+  SET TOOLCHAIN64="%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
+  SET TOOLCHAIN_NAME=Visual Studio 14 2015
+)
+IF "%6" == "12" (
+  SET TOOLCHAIN32="%VS120COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+  SET TOOLCHAIN64="%VS120COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
+  SET TOOLCHAIN_NAME=Visual Studio 12 2015
+)
+IF %TOOLCHAIN32% == "" (
+  echo Toolchain not set
+  GOTO END
+)
 
 rem set Visual C++ build environment
 IF "%1" == "amd64" (
   echo Generating for win64
-  call "%VS120COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat"
+  call %TOOLCHAIN64%
   SET CMWAKE_WIN64=^-DWIN64^=1
   SET INSTALLDIR=%BASEDIR%\build\x64
 )
 IF NOT "%1" == "amd64" (
   echo Generating for win32
-  call "%VS120COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+  call %TOOLCHAIN32%
   SET CMWAKE_WIN64=^-DWIN32^=1
   SET INSTALLDIR=%BASEDIR%\build
 )
 
 SET GEN_PROJECT_TYPE="NMake Makefiles"
 IF "%2" == "vs" (
-  SET GEN_PROJECT_TYPE="Visual Studio 12 2013"
+  SET GEN_PROJECT_TYPE="%TOOLCHAIN_NAME%"
   IF "%1" == "amd64" (
-    SET GEN_PROJECT_TYPE="Visual Studio 12 2013 Win64"
+    SET GEN_PROJECT_TYPE="%TOOLCHAIN_NAME% Win64"
   )
 )
 
 SET GEN_SHARED_LIBS=^-DBUILD_SHARED_LIBS^=1
-if "%6" == "static" (
+if "%7" == "static" (
   SET GEN_SHARED_LIBS=^-DBUILD_SHARED_LIBS^=0
 )
 
@@ -54,3 +71,5 @@ cmake %PROJECT_DIR% -G %GEN_PROJECT_TYPE% ^
       -DCMAKE_INSTALL_PREFIX=%INSTALLDIR% ^
       %GEN_SHARED_LIBS% ^
       %CMWAKE_WIN64%"
+
+:END

support/visual-studio.cmd

@@ -13,10 +13,10 @@ IF "%1" == "Release" (
 
 rem generate visual studio project files
 call build-platform.cmd amd64 %BUILDMODE%
-call generate-cmake.cmd amd64 vs "%BASEDIR%" "%BUILDBASEDIR%\build64" %BUILDMODE%
+call generate-cmake.cmd amd64 vs "%BASEDIR%" "%BUILDBASEDIR%\build64" %BUILDMODE% 14
 
 call build-platform.cmd x86 %BUILDMODE%
-call generate-cmake.cmd x86 vs "%BASEDIR%" "%BUILDBASEDIR%\build" %BUILDMODE%
+call generate-cmake.cmd x86 vs "%BASEDIR%" "%BUILDBASEDIR%\build" %BUILDMODE% 14
 
 rem cls
 echo Visual Studio solutions can be found in: