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/app/premake5.lua
+++ b/src/xenia/app/premake5.lua
@@ -8,17 +8,6 @@ project("xenia-app")
  targetname("xenia")
  language("C++")
  links({
-    "aes_128",
-    "capstone",
-    "fmt",
-    "dxbc",
-    "discord-rpc",
-    "glslang-spirv",
-    "imgui",
-    "libavcodec",
-    "libavutil",
-    "mspack",
-    "snappy",
    "xenia-app-discord",
    "xenia-apu",
    "xenia-apu-nop",
@@ -39,6 +28,19 @@ project("xenia-app")
    "xenia-ui",
    "xenia-ui-vulkan",
    "xenia-vfs",
+  })
+  links({
+    "aes_128",
+    "capstone",
+    "fmt",
+    "dxbc",
+    "discord-rpc",
+    "glslang-spirv",
+    "imgui",
+    "libavcodec",
+    "libavutil",
+    "mspack",
+    "snappy",
    "xxhash",
  })
  defines({