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/src/xenia/hid/premake5.lua
+++ b/src/xenia/hid/premake5.lua
@@ -40,11 +40,11 @@ project("xenia-hid-demo")

  filter("platforms:Linux")
    links({
+      "SDL2",
+      "vulkan",
      "X11",
      "xcb",
      "X11-xcb",
-      "vulkan",
-      "SDL2",
    })

  filter("platforms:Windows")