Reviewed-by: Konstantin Kostiuk <kkost...@redhat.com>
On Wed, Apr 20, 2022 at 5:08 PM <marcandre.lur...@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> Since the introduction of the variable in commit 9dacf32d2cb ("qemu-ga:
> Building Windows MSI installation with configure/Makefile"), nothing
> makes use of the Mingw_dlls variable in the .wxs file.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> configure | 3 ---
> qga/meson.build | 1 -
> 2 files changed, 4 deletions(-)
>
> diff --git a/configure b/configure
> index 7c08c18358be..8cbe55ac82e8 100755
> --- a/configure
> +++ b/configure
> @@ -2704,8 +2704,6 @@ if test "$QEMU_GA_VERSION" = ""; then
> QEMU_GA_VERSION=$(cat $source_path/VERSION)
> fi
>
> -QEMU_GA_MSI_MINGW_DLL_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
> -
> # Mac OS X ships with a broken assembler
> roms=
> if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
> @@ -2792,7 +2790,6 @@ if test "$debug_tcg" = "yes" ; then
> fi
> if test "$mingw32" = "yes" ; then
> 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_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
> echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
> echo "QEMU_GA_VERSION=${QEMU_GA_VERSION}" >> $config_host_mak
> diff --git a/qga/meson.build b/qga/meson.build
> index 392d56094198..da5e5efb19e8 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -129,7 +129,6 @@ if targetos == 'windows'
> wixl, '-o', '@OUTPUT0@', '@INPUT0@',
> qemu_ga_msi_arch[cpu],
> qemu_ga_msi_vss,
> - '-D', 'Mingw_dlls=' +
> config_host['QEMU_GA_MSI_MINGW_DLL_PATH'],
> ])
> all_qga += [qga_msi]
> alias_target('msi', qga_msi)
> --
> 2.35.1.693.g805e0a68082a
>
>
>
