Merge branch 'master' into d3d12

2018-11-24 16:26:27 +03:00
parent ff363d85be 24dd0267bf
commit 5c1efe7b9a
48 changed files with 10195 additions and 5730 deletions
--- a/premake5.lua
+++ b/premake5.lua
@@ -233,6 +233,7 @@ solution("xenia")
  include("third_party/glslang-spirv.lua")
  include("third_party/imgui.lua")
  include("third_party/libav.lua")
+  include("third_party/mspack.lua")
  include("third_party/snappy.lua")
  include("third_party/spirv-tools.lua")
  include("third_party/volk.lua")