Merge branch 'master' into d3d12

2018-12-16 12:49:09 +03:00
parent 574f85cc15 eee4d91621
commit 03f440582d
3 changed files with 19 additions and 15 deletions
--- a/src/xenia/app/premake5.lua
+++ b/src/xenia/app/premake5.lua
@@ -54,6 +54,10 @@ project("xenia-app")
    "xenia_main.cc",
    "../base/main_"..platform_suffix..".cc",
  })
+
+  filter("files:xenia_main.cc or ../base/main_"..platform_suffix..".cc")
+    vectorextensions("IA32")  -- Disable AVX for main_win.cc so our AVX check/error can happen.
+
  filter("platforms:Windows")
    files({
      "main_resources.rc",