AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

meson: Fix error when epoxy is a subproject on Windows

Browse Source 
epoxy_dep cannot be used in a configure time check when it comes from a
subproject. Use variables set in pc file instead.

This requires https://github.com/anholt/libepoxy/pull/231.
This commit is contained in:
Xavier Claessens 2020-10-14 17:26:23 -04:00
parent 57ebc351a9
commit fe89fd2317
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meson.build
View File

@ -613,20 +613,10 @@ if win32_enabled
backend_immodules += ['ime'] backend_immodules += ['ime']
# Check whether libepoxy is built with EGL support on Windows # Check whether libepoxy is built with EGL support on Windows
win32_has_egl = cc.links( win32_has_egl = epoxy_dep.get_variable(
''' pkgconfig: 'epoxy_has_egl',
#include <epoxy/egl.h> internal: 'epoxy_has_egl',
default_value: '0') == '1'
int main(int argc, char *argv[])
{
EGLDisplay disp = EGL_NO_DISPLAY;
return epoxy_egl_version (disp);
}
''',
dependencies : epoxy_dep,
name : 'libepoxy supports EGL on Windows'
)
endif endif
# Check for bind_textdomain_codeset, including -lintl if GLib brings it in by # Check for bind_textdomain_codeset, including -lintl if GLib brings it in by