mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: convert dummy Windows qga/qemu-ga target

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-01-28 15:06:16 +01:00
parent 328ec32d7d
commit 588a19fa9d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -450,11 +450,6 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS) qemu-keymap$(EXESUF): LIBS += $(XKBCOMMON_LIBS)
qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS) qemu-keymap$(EXESUF): QEMU_CFLAGS += $(XKBCOMMON_CFLAGS)
ifneq ($(EXESUF),)
.PHONY: qga/qemu-ga
qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)
endif
module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
$(call quiet-command,$(PYTHON) $< $@ \ $(call quiet-command,$(PYTHON) $< $@ \
$(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \

4
qga/meson.build
View File

@ -44,6 +44,7 @@ qga = executable('qemu-ga', qga_ss.sources(),
link_args: config_host['LIBS_QGA'].split(), link_args: config_host['LIBS_QGA'].split(),
dependencies: [qemuutil, libudev], dependencies: [qemuutil, libudev],
install: true) install: true)
all_qga = [qga]
if targetos == 'windows' if targetos == 'windows'
if 'CONFIG_QGA_VSS' in config_host if 'CONFIG_QGA_VSS' in config_host
@ -72,6 +73,9 @@ if targetos == 'windows'
config_host['QEMU_GA_MSI_WITH_VSS'].split(), config_host['QEMU_GA_MSI_WITH_VSS'].split(),
config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(), config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].split(),
]) ])
all_qga += [qga_msi]
alias_target('msi', qga_msi) alias_target('msi', qga_msi)
endif endif
endif endif
alias_target('qemu-ga', all_qga)

2
qga/vss-win32/meson.build
View File

@ -14,6 +14,8 @@ if add_languages('cpp', required: false)
cc.find_library('shlwapi'), cc.find_library('shlwapi'),
cc.find_library('uuid'), cc.find_library('uuid'),
cc.find_library('intl')]) cc.find_library('intl')])
all_qga += qga_vss
endif endif
# rules to build qga-vss.tlb # rules to build qga-vss.tlb