From df6fb22ec999f2e7c7f3f5ada048882b5a61bbf1 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Sat, 23 May 2026 08:22:54 +0200 Subject: [PATCH] Remove dependency on X11 Glad GLX was the last consumer of X11 libraries as such we no longer depend on X11 directly. Signed-off-by: Ralph Sennhauser --- build/premake/extern_libs5.lua | 12 ------------ build/premake/premake5.lua | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua index 4b916edca4..e99a37a961 100644 --- a/build/premake/extern_libs5.lua +++ b/build/premake/extern_libs5.lua @@ -752,18 +752,6 @@ extern_lib_defs = { 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 = { compile_settings = function() if os.istarget("windows") then diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua index 7993560bfc..3615888184 100644 --- a/build/premake/premake5.lua +++ b/build/premake/premake5.lua @@ -1057,9 +1057,6 @@ function setup_all_libs () 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 }) -- select files to build for the current platform glad_path = third_party_source_dir.."glad/" @@ -1110,11 +1107,6 @@ used_extern_libs = { "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 table.insert(used_extern_libs, "openal") table.insert(used_extern_libs, "vorbis") @@ -1349,10 +1341,6 @@ function setup_atlas_projects() "wxwidgets", "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, { -- include