From 1b13d920751b0d186d164d678f54605e9bea79b6 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Mon, 6 Jan 2025 16:27:04 -0700 Subject: [PATCH] meson: Fix opengl dependency --- meson.build | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 3fd0db6399..b104bb17cc 100644 --- a/meson.build +++ b/meson.build @@ -1748,13 +1748,19 @@ endif opengl = not_found if not get_option('opengl').auto() or have_system or have_vhost_user_gpu - epoxy = dependency('epoxy', method: 'pkg-config', - required: get_option('opengl')) - if cc.has_header('epoxy/egl.h', dependencies: epoxy) - opengl = epoxy - elif get_option('opengl').enabled() - error('epoxy/egl.h not found') + # FIXME: Use meson's 'gl' dep + if host_os == 'darwin' + opengl_libs=['-framework', 'OpenGL'] + elif host_os == 'windows' + opengl_libs=['-lopengl32', '-lgdi32'] + elif host_os == 'linux' + opengl_libs=['-lGL'] + else + error('Unknown GL platform') endif + + opengl = declare_dependency(compile_args: config_host['EPOXY_CFLAGS'].split(), + link_args: config_host['EPOXY_LIBS'].split() + opengl_libs) endif gbm = not_found