Merge remote-tracking branch 'origin/master' into d3d12

2019-08-02 10:00:36 -05:00
parent 90c9c24ca5 ce38e7b0b1
commit e05f3288e4
10 changed files with 170 additions and 0 deletions
--- a/src/xenia/app/premake5.lua
+++ b/src/xenia/app/premake5.lua
@@ -11,6 +11,7 @@ project("xenia-app")
    "aes_128",
    "capstone",
    "dxbc",
+    "discord-rpc",
    "gflags",
    "glew",
    "glslang-spirv",
@@ -21,6 +22,7 @@ project("xenia-app")
    "snappy",
    "spirv-tools",
    "volk",
+    "xenia-app-discord",
    "xenia-apu",
    "xenia-apu-nop",
    "xenia-base",