Merge branch 'master' into vulkan
This commit is contained in:
commit
dace81554c
|
@ -13,8 +13,11 @@ 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.."/".."**_gnulinux.h",
|
||||
base_path.."/".."**_gnulinux.cc"})
|
||||
removefiles({base_path.."/".."**_x11.h", base_path.."/".."**_x11.cc"})
|
||||
removefiles({base_path.."/".."**_gtk.h", base_path.."/".."**_gtk.cc"})
|
||||
removefiles({base_path.."/".."**_android.h", base_path.."/".."**_android.cc"})
|
||||
removefiles({base_path.."/".."**_mac.h", base_path.."/".."**_mac.cc"})
|
||||
removefiles({base_path.."/".."**_win.h", base_path.."/".."**_win.cc"})
|
||||
filter("platforms:Windows")
|
||||
|
@ -22,17 +25,27 @@ local function match_platform_files(base_path, base_match)
|
|||
base_path.."/"..base_match.."_win.h",
|
||||
base_path.."/"..base_match.."_win.cc",
|
||||
})
|
||||
filter("platforms:Linux")
|
||||
filter("platforms:Linux or Android")
|
||||
files({
|
||||
base_path.."/"..base_match.."_posix.h",
|
||||
base_path.."/"..base_match.."_posix.cc",
|
||||
base_path.."/"..base_match.."_linux.h",
|
||||
base_path.."/"..base_match.."_linux.cc",
|
||||
})
|
||||
filter("platforms:Linux")
|
||||
files({
|
||||
base_path.."/"..base_match.."_gnulinux.h",
|
||||
base_path.."/"..base_match.."_gnulinux.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("platforms:Android")
|
||||
files({
|
||||
base_path.."/"..base_match.."_android.h",
|
||||
base_path.."/"..base_match.."_android.cc",
|
||||
})
|
||||
filter({})
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue