ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: Migrate epoxy probe to meson.build

This commit is contained in:
Matt Borgerson 2025-03-22 14:30:47 -07:00 committed by mborgerson
parent 1893b56c38
commit 1eced78a07
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -1191,17 +1191,6 @@ EOF
fi
fi
##########################################
# epoxy probe
if $pkg_config --libs --silence-errors epoxy > /dev/null 2>&1 ; then
epoxy_libs=$($pkg_config --libs --silence-errors epoxy)
epoxy_cflags=$($pkg_config --cflags --silence-errors epoxy)
else
error_exit "epoxy not present." \
"Please install the epoxy devel package."
fi
##########################################
# detect rust triple
@ -1807,10 +1796,6 @@ if test "$default_targets" = "yes"; then
echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
fi
# FIXME: Use meson
echo "EPOXY_CFLAGS=$epoxy_cflags" >> $config_host_mak
echo "EPOXY_LIBS=$epoxy_libs" >> $config_host_mak
# tests/tcg configuration
mkdir -p tests/tcg
echo "# Automatically generated by configure - do not modify" > tests/tcg/$config_host_mak

5
meson.build
View File

@ -1774,6 +1774,8 @@ if not get_option('coreaudio').auto() or (host_os == 'darwin' and have_system)
required: get_option('coreaudio'))
endif
epoxy = dependency('epoxy', required: true)
opengl = not_found
if not get_option('opengl').auto() or have_system or have_vhost_user_gpu
# FIXME: Use meson's 'gl' dep
@ -1787,8 +1789,7 @@ if not get_option('opengl').auto() or have_system or have_vhost_user_gpu
error('Unknown GL platform')
endif
opengl = declare_dependency(compile_args: config_host['EPOXY_CFLAGS'].split(),
link_args: config_host['EPOXY_LIBS'].split() + opengl_libs)
opengl = declare_dependency(link_args: opengl_libs, dependencies: epoxy)
endif
gbm = not_found