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

This commit is contained in:
gibbed
2019-08-02 10:00:36 -05:00
10 changed files with 170 additions and 0 deletions

View File

@@ -241,6 +241,7 @@ solution("xenia")
include("third_party/aes_128.lua")
include("third_party/capstone.lua")
include("third_party/dxbc.lua")
include("third_party/discord-rpc.lua")
include("third_party/gflags.lua")
include("third_party/glew.lua")
include("third_party/glslang-spirv.lua")
@@ -255,6 +256,7 @@ solution("xenia")
include("src/xenia")
include("src/xenia/app")
include("src/xenia/app/discord")
include("src/xenia/apu")
include("src/xenia/apu/nop")
include("src/xenia/base")