Skip to content

Commit 6eed698

Browse files
authored
fix: find OpenGL by correct name on Linux (#9869)
1 parent ef44fd8 commit 6eed698

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

packages/g/glu/xmake.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ package("glu")
1111
end
1212
if opt.system then
1313
if package:is_plat("linux") and package.find_package then
14-
return package:find_package("glu", opt) or package:find_package("libglu", opt)
14+
return package:find_package("GLU", opt) or package:find_package("pkgconfig::glu", opt)
1515
end
1616
end
1717
end)
18+
19+
if is_plat("linux") then
20+
add_extsources("apt::libglu1-mesa-dev")
21+
end

packages/g/glx/xmake.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ package("glx")
66
on_fetch(function (package, opt)
77
if opt.system then
88
if package:is_plat("linux") and package.find_package then
9-
return package:find_package("glx", opt) or package:find_package("libglx", opt)
9+
return package:find_package("GLX", opt) or package:find_package("pkgconfig::glx", opt)
1010
end
1111
end
1212
end)
13+
14+
if is_plat("linux") then
15+
add_extsources("apt::libglx-dev")
16+
end

packages/o/opengl/xmake.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ package("opengl")
1212
end
1313
if opt.system then
1414
if package:is_plat("linux") and package.find_package then
15-
return package:find_package("opengl", opt) or package:find_package("libgl", opt)
15+
return package:find_package("OpenGL", opt) or package:find_package("GL", opt) or package:find_package("pkgconfig::opengl", opt) or package:find_package("pkgconfig::gl", opt)
1616
end
1717
end
1818
end)
19+
20+
if is_plat("linux") then
21+
add_extsources("apt::libopengl-dev")
22+
end

0 commit comments

Comments
 (0)