Merge pull request #560 from vonzepp/master

Added VS2015/.net 4.6 support for project files generation

.gitignore

@@ -33,6 +33,7 @@ src/generator/generator
 *.tmp
 /build/vs2012
 /build/vs2013
+/build/vs2015
 /build/gmake
 /build/headers
 /deps/llvm

build/GenerateProjects.bat

@@ -1,38 +1,44 @@
-@echo off
-goto menu
-
-:menu
-echo Build Project Generator:
-echo.
-echo [0] Clean
-echo [1] Visual C++ 2012
-echo [2] Visual C++ 2013
-echo [3] GNU Make
-echo.
-
-:choice
-set /P C="Choice: "
-if "%C%"=="3" goto gmake
-if "%C%"=="2" goto vs2013
-if "%C%"=="1" goto vs2012
-if "%C%"=="0" goto clean
-
-:clean
-"premake5" --file=premake4.lua clean
-goto quit
-
-:vs2012
-"premake5" --file=premake4.lua vs2012
-goto quit
-
-:vs2013
-"premake5" --file=premake4.lua vs2013
-goto quit
-
-:gmake
-"premake5" --file=premake4.lua gmake
-goto quit
-
-:quit
-pause
+@echo off
+goto menu
+
+:menu
+echo Build Project Generator:
+echo.
+echo [0] Clean
+echo [1] Visual C++ 2012
+echo [2] Visual C++ 2013
+echo [3] Visual C++ 2015
+echo [4] GNU Make
+echo.
+
+:choice
+set /P C="Choice: "
+if "%C%"=="4" goto gmake
+if "%C%"=="3" goto vs2015
+if "%C%"=="2" goto vs2013
+if "%C%"=="1" goto vs2012
+if "%C%"=="0" goto clean
+
+:clean
+"premake5" --file=premake4.lua clean
+goto quit
+
+:vs2012
+"premake5" --file=premake4.lua vs2012
+goto quit
+
+:vs2013
+"premake5" --file=premake4.lua vs2013
+goto quit
+
+:vs2015
+"premake5" --file=premake4.lua vs2015
+goto quit
+
+:gmake
+"premake5" --file=premake4.lua gmake
+goto quit
+
+:quit
+pause
 :end

build/premake4.lua

@@ -21,6 +21,9 @@ solution "CppSharp"
   debugdir (bindir)
 
   -- startproject "Generator"
+  configuration "vs2015"
+    framework "4.6"
+
   configuration "vs2013"
     framework "4.0"