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

2019-04-20 02:40:46 -05:00
parent 40ffba97d9 4f44bc3362
commit c965751911
12 changed files with 108 additions and 153 deletions
--- a/src/xenia/ui/vulkan/premake5.lua
+++ b/src/xenia/ui/vulkan/premake5.lua
@@ -47,15 +47,11 @@ project("xenia-ui-window-vulkan-demo")
    "../window_demo.cc",
    "vulkan_window_demo.cc",
    project_root.."/src/xenia/base/main_"..platform_suffix..".cc",
-    project_root.."/src/xenia/base/main_entrypoint_"..platform_suffix..".cc",
  })
  resincludedirs({
    project_root,
  })

-  filter("files:"..project_root.."/src/xenia/base/main_entrypoint_"..platform_suffix..".cc")
-    vectorextensions("IA32")  -- Disable AVX so our AVX check/error can happen.
-
  filter("platforms:Linux")
    links({
      "X11",