dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove dependency on X11

Browse source 
Glad GLX was the last consumer of X11 libraries as such we no longer
depend on X11 directly.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2026-05-23 08:22:54 +02:00
parent a27fe1f8a1
commit d58e605992
No known key found for this signature in database
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/premake/extern_libs5.lua
View file

@ -752,18 +752,6 @@ extern_lib_defs = {
end end
end, end,
}, },
x11 = {
compile_settings = function()
if not os.istarget("windows") and not os.istarget("macosx") then
pkgconfig.add_includes("x11")
end
end,
link_settings = function()
if not os.istarget("windows") and not os.istarget("macosx") then
pkgconfig.add_links("x11")
end
end,
},
zlib = { zlib = {
compile_settings = function() compile_settings = function()
if os.istarget("windows") then if os.istarget("windows") then

12
build/premake/premake5.lua
View file

@ -1057,9 +1057,6 @@ function setup_all_libs ()
extern_libs = { "glad" } extern_libs = { "glad" }
if not os.istarget("windows") and not _OPTIONS["android"] and not os.istarget("macosx") then
table.insert(extern_libs, "x11")
end
setup_static_lib_project("gladwrapper", {}, extern_libs, { no_pch = 1 }) setup_static_lib_project("gladwrapper", {}, extern_libs, { no_pch = 1 })
-- select files to build for the current platform -- select files to build for the current platform
glad_path = third_party_source_dir.."glad/" glad_path = third_party_source_dir.."glad/"
@ -1110,11 +1107,6 @@ used_extern_libs = {
"oleaut32", "oleaut32",
} }
if not os.istarget("windows") and not _OPTIONS["android"] and not os.istarget("macosx") then
-- X11 should only be linked on *nix
table.insert(used_extern_libs, "x11")
end
if not _OPTIONS["without-audio"] then if not _OPTIONS["without-audio"] then
table.insert(used_extern_libs, "openal") table.insert(used_extern_libs, "openal")
table.insert(used_extern_libs, "vorbis") table.insert(used_extern_libs, "vorbis")
@ -1349,10 +1341,6 @@ function setup_atlas_projects()
"wxwidgets", "wxwidgets",
"zlib", "zlib",
} }
if not os.istarget("windows") and not os.istarget("macosx") then
-- X11 should only be linked on *nix
table.insert(atlas_extern_libs, "x11")
end
setup_atlas_project("AtlasUI", "SharedLib", atlas_src, setup_atlas_project("AtlasUI", "SharedLib", atlas_src,
{ -- include { -- include