commit de2d30051a460e220817b5b5ae6e86bd5609b2b7
author Paolo Bonzini <pbonzini@redhat.com> Tue Sep 01 08:41:17 2020 -0400
committer Paolo Bonzini <pbonzini@redhat.com> Tue Sep 08 11:43:16 2020 +0200
tree f952b7910621a33698012ec19443859ff61ee45b
parent 215b0c2fa5c9864343373f5a3e6680611dabef20

meson: get opengl compilation flags from OPENGL_CFLAGS

The opengl compilation flags were added to QEMU_CFLAGS.  We do not
want them to be added to all compilation commands, so export them
also via OPENGL_CFLAGS rather than via QEMU_CFLAGS.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

configure

diff --git a/configure b/configure
index f2a3a11..1b1a4ce 100755
--- a/configure
+++ b/configure
@@ -7054,6 +7054,7 @@
 
 if test "$opengl" = "yes" ; then
   echo "CONFIG_OPENGL=y" >> $config_host_mak
+  echo "OPENGL_CFLAGS=$opengl_cflags" >> $config_host_mak
   echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
   if test "$opengl_dmabuf" = "yes" ; then
     echo "CONFIG_OPENGL_DMABUF=y" >> $config_host_mak

meson.build

diff --git a/meson.build b/meson.build
index 689fc22..071ef26 100644
--- a/meson.build
+++ b/meson.build
@@ -307,7 +307,8 @@
 endif
 opengl = not_found
 if 'CONFIG_OPENGL' in config_host
-  opengl = declare_dependency(link_args: config_host['OPENGL_LIBS'].split())
+  opengl = declare_dependency(compile_args: config_host['OPENGL_CFLAGS'].split(),
+                              link_args: config_host['OPENGL_LIBS'].split())
 else
 endif
 gtk = not_found