Merge branch 'master' into nazara-next

2020-08-27 20:12:36 +02:00
parent 056b78c2f7 ee3b5347b8
commit b2a7e620e0
21 changed files with 617 additions and 27 deletions
--- a/build/scripts/modules/platform.lua
+++ b/build/scripts/modules/platform.lua
@@ -16,3 +16,12 @@ MODULE.Files = {
 	"../src/Nazara/Platform/SDL2/**.hpp",
 	"../src/Nazara/Platform/SDL2/**.cpp"
 }
+
+MODULE.OsDefines.Windows = {
+	"SDL_VIDEO_DRIVER_WINDOWS=1"
+}
+
+MODULE.OsDefines.Posix = {
+	"SDL_VIDEO_DRIVER_X11=1",
+	"SDL_VIDEO_DRIVER_WAYLAND=1",
+}
--- a/build/scripts/modules/renderer.lua
+++ b/build/scripts/modules/renderer.lua
@@ -18,4 +18,3 @@ MODULE.OsFiles.Posix = {
    "../src/Nazara/Renderer/GLX/**.hpp",
    "../src/Nazara/Renderer/GLX/**.cpp"
 }
-