OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

meson: add spice_headers dependency.

Browse Source 
Used for files which (with CONFIG_SPICE=y) depend on spice header files
to pick up some enum, but which do not depend on on the actual spice
shared library.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20201014121120.13482-6-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-10-14 14:11:18 +02:00
parent 93ab5844b2
commit d72c34cccc
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/meson.build
View File

@ -1,5 +1,5 @@
softmmu_ss.add([spice_headers, files('audio.c')])
softmmu_ss.add(files( softmmu_ss.add(files(
'audio.c',
'audio_legacy.c', 'audio_legacy.c',
'mixeng.c', 'mixeng.c',
'noaudio.c', 'noaudio.c',

2
meson.build
View File

@ -321,9 +321,11 @@ if 'CONFIG_LIBJACK' in config_host
jack = declare_dependency(link_args: config_host['JACK_LIBS'].split()) jack = declare_dependency(link_args: config_host['JACK_LIBS'].split())
endif endif
spice = not_found spice = not_found
spice_headers = not_found
if 'CONFIG_SPICE' in config_host if 'CONFIG_SPICE' in config_host
spice = declare_dependency(compile_args: config_host['SPICE_CFLAGS'].split(), spice = declare_dependency(compile_args: config_host['SPICE_CFLAGS'].split(),
link_args: config_host['SPICE_LIBS'].split()) link_args: config_host['SPICE_LIBS'].split())
spice_headers = declare_dependency(compile_args: config_host['SPICE_CFLAGS'].split())
endif endif
rt = cc.find_library('rt', required: false) rt = cc.find_library('rt', required: false)
libdl = not_found libdl = not_found

2
monitor/meson.build
View File

@ -3,7 +3,7 @@ qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c'))
softmmu_ss.add(files( softmmu_ss.add(files(
'hmp-cmds.c', 'hmp-cmds.c',
'hmp.c', 'hmp.c',
'qmp-cmds.c',
)) ))
softmmu_ss.add([spice_headers, files('qmp-cmds.c')])
specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('misc.c'), spice]) specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('misc.c'), spice])