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/thirdparty/build/lua.lua
+++ b/thirdparty/build/lua.lua
@@ -8,3 +8,11 @@ LIBRARY.Files = {
 	"../thirdparty/src/Lua/*.h",
 	"../thirdparty/src/Lua/*.cpp"
 }
+
+LIBRARY.OsDefines.Windows = {
+	"LUA_USE_WINDOWS"
+}
+
+LIBRARY.OsDefines.Posix = {
+	"LUA_USE_LINUX"
+}
--- a/thirdparty/include/SDL2/SDL_config.h
+++ b/thirdparty/include/SDL2/SDL_config.h
@@ -214,7 +214,6 @@ typedef unsigned int uintptr_t;

 /* Enable various video drivers */
 #define SDL_VIDEO_DRIVER_DUMMY  1
-#define SDL_VIDEO_DRIVER_WINDOWS    1

 #ifndef SDL_VIDEO_RENDER_D3D
 #define SDL_VIDEO_RENDER_D3D    1