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

Merge branch 'linux' of git://github.com/dougvj/xenia into linux

Browse Source 
# Conflicts:
#	.travis.yml
This commit is contained in:
DrChat
2017-12-14 19:20:02 -06:00
parent d896c1f3f0 0406f19f4d
commit 02e37be4e5
45 changed files with 2214 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/build/scripts/platform_files.lua
View File

@@ -13,6 +13,8 @@ local function match_platform_files(base_path, base_match)
removefiles({base_path.."/".."**_test.cc"})
removefiles({base_path.."/".."**_posix.h", base_path.."/".."**_posix.cc"})
removefiles({base_path.."/".."**_linux.h", base_path.."/".."**_linux.cc"})
removefiles({base_path.."/".."**_x11.h", base_path.."/".."**_x11.cc"})
removefiles({base_path.."/".."**_gtk.h", base_path.."/".."**_gtk.cc"})
removefiles({base_path.."/".."**_mac.h", base_path.."/".."**_mac.cc"})
removefiles({base_path.."/".."**_win.h", base_path.."/".."**_win.cc"})
filter("platforms:Windows")
@@ -26,6 +28,10 @@ local function match_platform_files(base_path, base_match)
base_path.."/"..base_match.."_posix.cc",
base_path.."/"..base_match.."_linux.h",
base_path.."/"..base_match.."_linux.cc",
base_path.."/"..base_match.."_x11.h",
base_path.."/"..base_match.."_x11.cc",
base_path.."/"..base_match.."_gtk.h",
base_path.."/"..base_match.."_gtk.cc",
})
filter({})
end