fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gibbed
2019-04-20 02:40:46 -05:00
parent 40ffba97d9 4f44bc3362
commit c965751911
12 changed files with 108 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/app/premake5.lua
View File

@@ -51,7 +51,7 @@ project("xenia-app")
files({
"xenia_main.cc",
"../base/main_"..platform_suffix..".cc",
"../base/main_entrypoint_"..platform_suffix..".cc",
"../base/main_init_"..platform_suffix..".cc",
})
resincludedirs({
@@ -63,8 +63,8 @@ project("xenia-app")
"main_resources.rc",
})
filter("files:../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("files:../base/main_init_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX for main_init_win.cc so our AVX check doesn't use AVX instructions.
filter("platforms:Linux")
links({