diff --git a/.gitignore b/.gitignore index 42b36eacdc..8189ad1dd8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ src/generator/generator *.tmp /build/vs2012 /build/vs2013 +/build/vs2015 /build/gmake /build/headers /deps/llvm diff --git a/build/GenerateProjects.bat b/build/GenerateProjects.bat index e0e102be8d..93daf595bf 100644 --- a/build/GenerateProjects.bat +++ b/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 \ No newline at end of file diff --git a/build/premake4.lua b/build/premake4.lua index 559007e129..78ad648cc0 100644 --- a/build/premake4.lua +++ b/build/premake4.lua @@ -21,6 +21,9 @@ solution "CppSharp" debugdir (bindir) -- startproject "Generator" + configuration "vs2015" + framework "4.6" + configuration "vs2013" framework "4.0" diff --git a/build/premake5.exe b/build/premake5.exe index 14bf42ff21..1e9e7f33c8 100644 Binary files a/build/premake5.exe and b/build/premake5.exe differ