Merge branch 'master' into SDL2

2020-05-27 11:11:21 +02:00
parent 96ea792656 ca2425f310
commit 1425f99edf
211 changed files with 7628 additions and 2883 deletions
--- a/build/Build_VS2015.bat
+++ b/build/Build_VS2015.bat
@@ -1 +1 @@
-.\premake5.exe vs2015
+.\premake5.exe --premakeproject vs2015
--- a/build/Build_VS2017.bat
+++ b/build/Build_VS2017.bat
@@ -1 +1 @@
-.\premake5.exe vs2017
+.\premake5.exe --premakeproject vs2017
--- a/build/Build_VS2019.bat
+++ b/build/Build_VS2019.bat
@@ -0,0 +1 @@
+.\premake5.exe --premakeproject vs2019
--- a/build/config.lua
+++ b/build/config.lua
@@ -11,7 +11,7 @@ BuildDependencies = true
 BuildExamples = true

 -- Setup configurations array (valid values: Debug, Release, ReleaseWithDebug) 
-Configurations = "Debug,Release" -- "Debug,Release,ReleaseWithDebug"
+Configurations = "Debug,Release,ReleaseWithDebug" -- "Debug,Release,ReleaseWithDebug"

 -- Setup additionnals install directories, separated by a semi-colon ; (library binaries will be copied there)
 --InstallDir = "/usr/local/lib64"
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -58,6 +58,7 @@ function NazaraBuild:Execute()
 		workspace("NazaraEngine")
 		platforms(platformData)

+		startproject "DemoFirstScene"
 		location(_ACTION)

 		do
@@ -840,6 +841,7 @@ function NazaraBuild:PrepareGeneric()
 		targetsuffix("-d")

 	filter("configurations:*Debug*")
+		optimize("Debug")
 		symbols("On")

 	filter("configurations:not *Debug*")