Merge branch 'master' into vulkan

build/scripts/common.lua

@@ -409,6 +409,7 @@ function NazaraBuild:Initialize()
 		if (f) then
 			MODULE = {}
 			self:SetupModuleTable(MODULE)
+			Config = self.Config
 
 			f()
 
@@ -551,6 +552,7 @@ function NazaraBuild:LoadConfig()
 	AddBoolOption("PremakeProject", "premakeproject", "Add a PremakeProject as a shortcut to call Premake")
 	AddBoolOption("ServerMode", "server", "Excludes client-only modules/tools/examples")
 	AddBoolOption("UniteModules", "united", "Builds all the modules as one united library")
+	AddBoolOption("PlatformSDL2", "platform-sdl2", "Use SDL2 instead of native APIs")
 
 	-- AdditionalCompilationOptions
 	do

build/scripts/modules/platform.lua

@@ -2,32 +2,17 @@ MODULE.Name = "Platform"
 
 MODULE.ClientOnly = true
 
+MODULE.Defines = {
+	"NAZARA_PLATFORM_SDL2"
+}
+
 MODULE.Libraries = {
 	"NazaraCore",
-	"NazaraUtility"
+	"NazaraUtility",
+	"SDL2"
 }
 
-MODULE.OsFiles.Windows = {
-	"../src/Nazara/Platform/Win32/**.hpp",
-	"../src/Nazara/Platform/Win32/**.cpp"
+MODULE.Files = {
+	"../src/Nazara/Platform/SDL2/**.hpp",
+	"../src/Nazara/Platform/SDL2/**.cpp"
 }
-
-MODULE.OsFiles.Posix = {
-	"../src/Nazara/Platform/X11/**.hpp",
-	"../src/Nazara/Platform/X11/**.cpp"
-}
-
-MODULE.OsLibraries.Windows = {
-	"gdi32"
-}
-
-MODULE.OsLibraries.Posix = {
-	"X11",
-	"xcb",
-	"xcb-cursor",
-	"xcb-ewmh",
-	"xcb-icccm",
-	"xcb-keysyms",
-	"xcb-randr"
-}
-

build/scripts/modules/renderer.lua

@@ -13,22 +13,23 @@ MODULE.Libraries = {
 }
 
 MODULE.OsFiles.Windows = {
-	"../src/Nazara/Renderer/Win32/**.hpp",
-	"../src/Nazara/Renderer/Win32/**.cpp"
+    "../src/Nazara/Renderer/Win32/**.hpp",
+    "../src/Nazara/Renderer/Win32/**.cpp"
 }
 
 MODULE.OsFiles.Posix = {
-	"../src/Nazara/Renderer/GLX/**.hpp",
-	"../src/Nazara/Renderer/GLX/**.cpp"
+    "../src/Nazara/Renderer/GLX/**.hpp",
+    "../src/Nazara/Renderer/GLX/**.cpp"
 }
 
 MODULE.OsLibraries.Windows = {
-	"gdi32",
-	"opengl32",
-	"winmm"
+    "gdi32",
+    "opengl32",
+    "winmm"
 }
 
 MODULE.OsLibraries.Posix = {
-	"GL",
-	"X11"
+    "GL",
+    "X11"
 }
+