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

Merge branch 'master' into d3d12

Browse Source
This commit is contained in:
Triang3l
2019-04-19 15:32:10 +03:00
parent c006acf2c2 18d8a59cfa
commit 40ffba97d9
12 changed files with 176 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ project("xenia-cpu-ppc-tests")
files({
"ppc_testing_main.cc",
"../../../base/main_"..platform_suffix..".cc",
"../../../base/main_entrypoint_"..platform_suffix..".cc",
})
files({
"*.s",
@@ -25,8 +26,11 @@ 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({
@@ -51,14 +55,12 @@ 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",
})
@@ -70,4 +72,9 @@ 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