summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-10-14 17:26:23 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2020-10-14 20:05:05 -0400
commitaeba99079371d2ef637e4d2b7b86b9aa8bebe220 (patch)
tree4980884de1f28ac964d90972b54591b0b0a4423a
parentb46f50079bd80eb6f572a6524ee6b9040ecab7ff (diff)
downloadgtk+-aeba99079371d2ef637e4d2b7b86b9aa8bebe220.tar.gz
meson: Fix error when epoxy is a subproject on Windows
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.
-rw-r--r--meson.build18
1 files changed, 5 insertions, 13 deletions
diff --git a/meson.build b/meson.build
index 6afd5e4efb..4a43260c62 100644
--- a/meson.build
+++ b/meson.build
@@ -667,19 +667,11 @@ if win32_enabled
endif
pc_gdk_extra_libs += ['-lwinmm', '-ldwmapi', '-lsetupapi', '-lcfgmgr32']
-# Check whether libepoxy is built with EGL support on Windows
- win32_has_egl = cc.links(
- '''
- #include <epoxy/egl.h>
-
- int main(int argc, char *argv[]) {
- return epoxy_egl_version (EGL_NO_DISPLAY);
- }
- ''',
- dependencies : epoxy_dep,
- name : 'libepoxy supports EGL on Windows'
- )
-
+ # 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
# IMModules stuff-unfortunately we need to put items here