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

13
src/xenia/cpu/ppc/testing/premake5.lua
View File

@@ -18,7 +18,6 @@ project("xenia-cpu-ppc-tests")
files({
"ppc_testing_main.cc",
"../../../base/main_"..platform_suffix..".cc",
"../../../base/main_entrypoint_"..platform_suffix..".cc",
})
files({
"*.s",
@@ -26,11 +25,8 @@ project("xenia-cpu-ppc-tests")
includedirs({
project_root.."/third_party/gflags/src",
})
filter("files:*.s")
flags({"ExcludeFromBuild"})
filter("files:../../../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
filter("platforms:Windows")
debugdir(project_root)
debugargs({
@@ -55,12 +51,14 @@ project("xenia-cpu-ppc-nativetests")
files({
"ppc_testing_native_main.cc",
"../../../base/main_"..platform_suffix..".cc",
"../../../base/main_entrypoint_"..platform_suffix..".cc",
})
files({
"instr_*.s",
"seq_*.s",
})
filter("files:instr_*.s", "files:seq_*.s")
flags({"ExcludeFromBuild"})
filter({})
includedirs({
project_root.."/third_party/gflags/src",
})
@@ -72,9 +70,4 @@ project("xenia-cpu-ppc-nativetests")
"ppc_testing_native_thunks.s",
})
filter("files:instr_*.s", "files:seq_*.s")
flags({"ExcludeFromBuild"})
filter("files:../../../base/main_entrypoint_"..platform_suffix..".cc")
vectorextensions("IA32") -- Disable AVX so our AVX check/error can happen.
end