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

This commit is contained in:
gibbed
2019-04-20 02:40:46 -05:00
12 changed files with 108 additions and 153 deletions

View File

@@ -68,12 +68,8 @@ 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",
@@ -143,12 +139,8 @@ 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",