Merge branch 'master' into vulkan

2020-11-15 14:06:15 +03:00
parent 0ec215a8a0 171c97c929
commit 8febf02a39
35 changed files with 737 additions and 670 deletions
--- a/third_party/SDL2-static.lua
+++ b/third_party/SDL2-static.lua
@@ -18,7 +18,7 @@ project("SDL2")
    "SDL2/include",
  })
  buildoptions({
-    "/wd4828",  -- illegal characters in file
+    "/wd4828",  -- illegal characters in file https://bugzilla.libsdl.org/show_bug.cgi?id=5333
  })
  files({
    -- 1:1 from SDL.vcxproj file
--- a/third_party/premake-cmake
+++ b/third_party/premake-cmake