[gtk/wip/otte/gl-hdr] build: Add a HAVE_EGL define to config.h
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/gl-hdr] build: Add a HAVE_EGL define to config.h
- Date: Tue, 5 Oct 2021 02:16:27 +0000 (UTC)
commit 0d107d038d50f0a5faa5beb534d45847a0c3aaf2
Author: Benjamin Otte <otte redhat com>
Date: Tue Oct 5 04:14:57 2021 +0200
build: Add a HAVE_EGL define to config.h
gdk/win32/meson.build | 2 +-
meson.build | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
index 93c55fa6d8..0177adaf83 100644
--- a/gdk/win32/meson.build
+++ b/gdk/win32/meson.build
@@ -48,7 +48,7 @@ install_headers(gdk_win32_public_headers, 'gdkwin32.h', subdir: 'gtk-4.0/gdk/win
GDK_WIN32_EGL_CFLAGS = []
-if win32_has_egl
+if have_egl
GDK_WIN32_EGL_CFLAGS = ['-DGDK_WIN32_ENABLE_EGL']
gdk_win32_sources += ['gdkglcontext-win32-egl.c']
endif
diff --git a/meson.build b/meson.build
index bea2015429..897de13766 100644
--- a/meson.build
+++ b/meson.build
@@ -481,7 +481,15 @@ if not cairo_csi_dep.found()
cairo_csi_dep = cc.find_library('cairo-script-interpreter', required: get_option('build-tests'))
endif
+have_egl = epoxy_dep.get_variable(
+ pkgconfig: 'epoxy_has_egl',
+ internal: 'epoxy_has_egl',
+ default_value: '0') == '1'
+
cdata.set('HAVE_CAIRO_SCRIPT_INTERPRETER', cairo_csi_dep.found())
+if have_egl
+ cdata.set('HAVE_EGL', 1)
+endif
cdata.set('HAVE_HARFBUZZ', harfbuzz_dep.found())
cdata.set('HAVE_PANGOFT', pangoft_dep.found())
@@ -589,10 +597,6 @@ if win32_enabled
pc_gdk_extra_libs += ['-lwinmm', '-ldwmapi', '-lsetupapi', '-lcfgmgr32']
# Check whether libepoxy is built with EGL support on Windows
- win32_has_egl = epoxy_dep.get_variable(
- pkgconfig: 'epoxy_has_egl',
- internal: 'epoxy_has_egl',
- default_value: '0') == '1'
endif
# Check for bind_textdomain_codeset, including -lintl if GLib brings it in by
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]