mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 07:22:46 +00:00
qga: wixl: get path to sysroot from pkg-config as intended
The .wxs file uses $(var.Mingw_bin) while configure/meson have always used Mingw_dlls. Fix them to match what was probably intended. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
ff8ca58d20
commit
6e4442090b
4
configure
vendored
4
configure
vendored
|
@ -2702,7 +2702,7 @@ if test "$QEMU_GA_VERSION" = ""; then
|
||||||
QEMU_GA_VERSION=$(cat $source_path/VERSION)
|
QEMU_GA_VERSION=$(cat $source_path/VERSION)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
|
QEMU_GA_MSI_MINGW_BIN_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
|
||||||
|
|
||||||
# Mac OS X ships with a broken assembler
|
# Mac OS X ships with a broken assembler
|
||||||
roms=
|
roms=
|
||||||
|
@ -2790,7 +2790,7 @@ if test "$debug_tcg" = "yes" ; then
|
||||||
fi
|
fi
|
||||||
if test "$mingw32" = "yes" ; then
|
if test "$mingw32" = "yes" ; then
|
||||||
echo "CONFIG_WIN32=y" >> $config_host_mak
|
echo "CONFIG_WIN32=y" >> $config_host_mak
|
||||||
echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $config_host_mak
|
echo "QEMU_GA_MSI_MINGW_BIN_PATH=${QEMU_GA_MSI_MINGW_BIN_PATH}" >> $config_host_mak
|
||||||
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
|
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
|
||||||
echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
|
echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
|
||||||
echo "QEMU_GA_VERSION=${QEMU_GA_VERSION}" >> $config_host_mak
|
echo "QEMU_GA_VERSION=${QEMU_GA_VERSION}" >> $config_host_mak
|
||||||
|
|
|
@ -129,7 +129,7 @@ if targetos == 'windows'
|
||||||
wixl, '-o', '@OUTPUT0@', '@INPUT0@',
|
wixl, '-o', '@OUTPUT0@', '@INPUT0@',
|
||||||
qemu_ga_msi_arch[cpu],
|
qemu_ga_msi_arch[cpu],
|
||||||
qemu_ga_msi_vss,
|
qemu_ga_msi_vss,
|
||||||
'-D', 'Mingw_dlls=' + config_host['QEMU_GA_MSI_MINGW_DLL_PATH'],
|
'-D', 'Mingw_bin=' + config_host['QEMU_GA_MSI_MINGW_BIN_PATH'],
|
||||||
])
|
])
|
||||||
all_qga += [qga_msi]
|
all_qga += [qga_msi]
|
||||||
alias_target('msi', qga_msi)
|
alias_target('msi', qga_msi)
|
||||||
|
|
Loading…
Reference in a new issue