motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 09:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: get opengl compilation flags from OPENGL_CFLAGS

Browse source 
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>
This commit is contained in:
Paolo Bonzini 2020-09-01 08:41:17 -04:00
parent 215b0c2fa5
commit de2d30051a
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure vendored
View file

@ -7054,6 +7054,7 @@ fi
if test "$opengl" = "yes" ; then if test "$opengl" = "yes" ; then
echo "CONFIG_OPENGL=y" >> $config_host_mak echo "CONFIG_OPENGL=y" >> $config_host_mak
echo "OPENGL_CFLAGS=$opengl_cflags" >> $config_host_mak
echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
if test "$opengl_dmabuf" = "yes" ; then if test "$opengl_dmabuf" = "yes" ; then
echo "CONFIG_OPENGL_DMABUF=y" >> $config_host_mak echo "CONFIG_OPENGL_DMABUF=y" >> $config_host_mak

3
meson.build
View file

@ -307,7 +307,8 @@ if 'CONFIG_AUDIO_COREAUDIO' in config_host
endif endif
opengl = not_found opengl = not_found
if 'CONFIG_OPENGL' in config_host 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 else
endif endif
gtk = not_found gtk = not_found