Merge branch 'master' into d3d12

2019-04-19 15:32:10 +03:00
parent c006acf2c2 18d8a59cfa
commit 40ffba97d9
12 changed files with 176 additions and 72 deletions
--- a/src/xenia/ui/vulkan/premake5.lua
+++ b/src/xenia/ui/vulkan/premake5.lua
@@ -47,11 +47,15 @@ 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",