Skip to content

glslang: improve binaryonly config #8815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Willaaaaaaa wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

glslang: improve binaryonly config #8815

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcfb55f
improve binonly config
Willaaaaaaa Dec 10, 2025
69cc45d
fix: set kind=static when binary=true
Willaaaaaaa Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions packages/g/glslang/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package("glslang")

add_patches("1.3.246+1", "https://github.com/KhronosGroup/glslang/commit/1e4955adbcd9b3f5eaf2129e918ca057baed6520.patch", "47893def550f1684304ef7c49da38f0a8fe35c190a3452d3bf58370b3ee7165d")

add_configs("binaryonly", {description = "Only use binary program.", default = false, type = "boolean"})
add_configs("binaryonly", {description = "Only use binary program.", default = true, type = "boolean"})
add_configs("exceptions", {description = "Build with exception support.", default = false, type = "boolean"})
add_configs("spirv_tools", {description = "Enable SPIRV-Tools integration (Optimizer).", default = false, type = "boolean"})
add_configs("hlsl", {description = "Enable HLSL support.", default = true, type = "boolean"})
Expand Down Expand Up @@ -56,18 +56,19 @@ package("glslang")
if package:config("tools") or package:is_binary() then
package:addenv("PATH", "bin")
end

package:add("links", "glslang", "MachineIndependent", "GenericCodeGen", "OGLCompiler", "OSDependent", "SPIRV", "SPVRemapper")
if package:config("hlsl") then
package:add("links", "HLSL")
end
if package:config("default_resource_limits") then
package:add("links", "glslang-default-resource-limits")
if not package:is_binary() then
package:add("links", "glslang", "MachineIndependent", "GenericCodeGen", "OGLCompiler", "OSDependent", "SPIRV", "SPVRemapper")
if package:config("hlsl") then
package:add("links", "HLSL")
end
if package:config("default_resource_limits") then
package:add("links", "glslang-default-resource-limits")
end
end
end)

on_fetch(function (package, opt)
if opt.system and package:config("binaryonly") then
if opt.system and package:is_binary() then
return package:find_tool("glslangValidator")
end
end)
Expand Down Expand Up @@ -110,16 +111,20 @@ package("glslang")
end
import("package.tools.cmake").install(package, configs, {packagedeps = packagedeps})

os.cp("glslang/MachineIndependent/**.h", package:installdir("include", "glslang", "MachineIndependent"))
os.cp("glslang/Include/**.h", package:installdir("include", "glslang", "Include"))

-- https://github.com/KhronosGroup/glslang/releases/tag/12.3.0
if package:config("tools") then
local bindir = package:installdir("bin")
local glslangValidator = path.join(bindir, "glslangValidator" .. (is_host("windows") and ".exe" or ""))
if not os.isfile(glslangValidator) then
local glslang = path.join(bindir, "glslang" .. (is_host("windows") and ".exe" or ""))
os.trycp(glslang, glslangValidator)
if package:is_binary() then
os.rm(package:installdir("*|bin"))
else
os.cp("glslang/MachineIndependent/**.h", package:installdir("include", "glslang", "MachineIndependent"))
os.cp("glslang/Include/**.h", package:installdir("include", "glslang", "Include"))

-- https://github.com/KhronosGroup/glslang/releases/tag/12.3.0
if package:config("tools") then
local bindir = package:installdir("bin")
local glslangValidator = path.join(bindir, "glslangValidator" .. (is_host("windows") and ".exe" or ""))
if not os.isfile(glslangValidator) then
local glslang = path.join(bindir, "glslang" .. (is_host("windows") and ".exe" or ""))
os.trycp(glslang, glslangValidator)
end
end
end
end)
Expand All @@ -129,7 +134,7 @@ package("glslang")
os.vrun("glslangValidator --version")
end

if not package:config("binaryonly") then
if not package:is_binary() then
assert(package:has_cxxfuncs("ShInitialize", {configs = {languages = "c++11"}, includes = "glslang/Public/ShaderLang.h"}))
end
end)
Loading