Merge branch 'master' into d3d12

This commit is contained in:
Triang3l
2019-04-19 15:32:10 +03:00
12 changed files with 176 additions and 72 deletions

View File

@@ -68,8 +68,12 @@ project("xenia-gpu-vulkan-trace-viewer")
files({
"vulkan_trace_viewer_main.cc",
"../../base/main_"..platform_suffix..".cc",
"../../base/main_entrypoint_"..platform_suffix..".cc",
})
filter("files:../../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Linux")
links({
"X11",
@@ -139,8 +143,12 @@ project("xenia-gpu-vulkan-trace-dump")
files({
"vulkan_trace_dump_main.cc",
"../../base/main_"..platform_suffix..".cc",
"../../base/main_entrypoint_"..platform_suffix..".cc",
})
filter("files:../../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Linux")
links({
"X11",