@@ -956,7 +956,7 @@ if test "$mingw32" = "yes" ; then
EXESUF=".exe"
HOST_DSOSUF=".dll"
# MinGW needs -mthreads for TLS and macro _MT.
- QEMU_CFLAGS="-mthreads $QEMU_CFLAGS"
+ CFLAGS="-mthreads $CFLAGS"
LIBS="-lwinmm -lws2_32 $LIBS"
write_c_skeleton;
if compile_prog "" "-liberty" ; then
@@ -8125,16 +8125,20 @@ echo >> "$iotests_common_env"
echo "export PYTHON='$python'" >> "$iotests_common_env"
cross="config-meson.cross.new"
+meson_quote() {
+ echo "['$(echo $* | sed "s/ /','/g")']"
+}
+
echo "# Automatically generated by configure - do not modify" > $cross
echo "[binaries]" >> $cross
-echo "c = '$cc'" >> $cross
-echo "cpp = '$cxx'" >> $cross
-echo "ar = '$ar'" >> $cross
-echo "nm = '$nm'" >> $cross
-echo "pkgconfig = '$pkg_config_exe'" >> $cross
-echo "ranlib = '$ranlib'" >> $cross
-echo "strip = '$strip'" >> $cross
-echo "windres = '$windres'" >> $cross
+echo "c = $(meson_quote $cc)" >> $cross
+echo "cpp = $(meson_quote $cxx)" >> $cross
+echo "ar = $(meson_quote $ar)" >> $cross
+echo "nm = $(meson_quote $nm)" >> $cross
+echo "pkgconfig = $(meson_quote $pkg_config_exe)" >> $cross
+echo "ranlib = $(meson_quote $ranlib)" >> $cross
+echo "strip = $(meson_quote $strip)" >> $cross
+echo "windres = $(meson_quote $windres)" >> $cross
if test -n "$cross_prefix"; then
cross_arg="--cross-file config-meson.cross"
# Hack: Meson expects an absolute path for the *build* machine
@@ -3,6 +3,6 @@ if 'CONFIG_PVRDMA' in config_host
libumad = cc.find_library('ibumad', required: true)
executable('rdmacm-mux', files('main.c'),
dependencies: [glib, libumad],
- build_by_default: targetos == 'linux',
+ build_by_default: false,
install: false)
endif
@@ -221,7 +221,8 @@ if 'CONFIG_BRLAPI' in config_host
brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split())
endif
-sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static)
+sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static,
+ include_type: 'system')
sdl_image = not_found
if sdl.found()
sdl_image = dependency('sdl-image', required: get_option('sdl_image'),