meson: convert root directory to Meson
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
parent
2b1ccdf441
commit
4a96337dfa
|
|
@ -48,16 +48,9 @@ storage-daemon-obj-$(CONFIG_POSIX) += os-posix.o
|
|||
# single QEMU executable should support all CPUs and machines.
|
||||
|
||||
ifeq ($(CONFIG_SOFTMMU),y)
|
||||
common-obj-y = blockdev.o blockdev-nbd.o
|
||||
common-obj-y += bootdevice.o iothread.o
|
||||
common-obj-y += dump/
|
||||
common-obj-y += job-qmp.o
|
||||
common-obj-y = dump/
|
||||
common-obj-y += monitor/
|
||||
common-obj-y += net/
|
||||
common-obj-y += qdev-monitor.o
|
||||
common-obj-$(CONFIG_WIN32) += os-win32.o
|
||||
common-obj-$(CONFIG_POSIX) += os-posix.o
|
||||
|
||||
common-obj-$(CONFIG_LINUX) += fsdev/
|
||||
|
||||
common-obj-y += accel/
|
||||
|
|
@ -87,25 +80,15 @@ common-obj-y += hw/
|
|||
common-obj-m += hw/
|
||||
|
||||
common-obj-y += replay/
|
||||
|
||||
common-obj-y += dma-helpers.o
|
||||
common-obj-$(CONFIG_TPM) += tpm.o
|
||||
|
||||
common-obj-y += backends/
|
||||
|
||||
common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
|
||||
qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)
|
||||
qemu-seccomp.o-libs := $(SECCOMP_LIBS)
|
||||
|
||||
common-obj-$(CONFIG_FDT) += device_tree.o
|
||||
|
||||
common-obj-y += qapi/
|
||||
|
||||
endif # CONFIG_SOFTMMU
|
||||
|
||||
#######################################################################
|
||||
# Target-independent parts used in system and user emulation
|
||||
common-obj-y += cpus-common.o
|
||||
|
||||
common-obj-y += hw/
|
||||
common-obj-y += qom/
|
||||
common-obj-y += disas/
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ ifneq ($(CONFIG_MODULES),y)
|
|||
LIBS := $(LIBS) $(ALSA_LIBS) $(OSS_LIBS) $(PULSE_LIBS) $(SDL_LIBS)
|
||||
LIBS := $(LIBS) $(GTK_LIBS) $(VTE_LIBS) $(X11_LIBS) $(CURSES_LIBS) $(ICONV_LIBS) $(GIO_LIBS)
|
||||
endif
|
||||
LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS)
|
||||
LIBS := $(LIBS) $(BRLAPI_LIBS) $(SDL_LIBS) $(SPICE_LIBS) $(OPENGL_LIBS) $(SECCOMP_LIBS)
|
||||
LIBS := $(LIBS) $(COREAUDIO_LIBS) $(DSOUND_LIBS)
|
||||
|
||||
# Hardware support
|
||||
|
|
|
|||
2
configure
vendored
2
configure
vendored
|
|
@ -7380,6 +7380,8 @@ if test "$preadv" = "yes" ; then
|
|||
fi
|
||||
if test "$fdt" != "no" ; then
|
||||
echo "CONFIG_FDT=y" >> $config_host_mak
|
||||
echo "FDT_CFLAGS=$fdt_cflags" >> $config_host_mak
|
||||
echo "FDT_LIBS=$fdt_ldflags $fdt_libs" >> $config_host_mak
|
||||
fi
|
||||
if test "$membarrier" = "yes" ; then
|
||||
echo "CONFIG_MEMBARRIER=y" >> $config_host_mak
|
||||
|
|
|
|||
33
meson.build
33
meson.build
|
|
@ -51,6 +51,7 @@ targetos = host_machine.system()
|
|||
|
||||
m = cc.find_library('m', required: false)
|
||||
util = cc.find_library('util', required: false)
|
||||
winmm = []
|
||||
socket = []
|
||||
version_res = []
|
||||
coref = []
|
||||
|
|
@ -59,6 +60,7 @@ cocoa = []
|
|||
hvf = []
|
||||
if targetos == 'windows'
|
||||
socket = cc.find_library('ws2_32')
|
||||
winmm = cc.find_library('winmm')
|
||||
|
||||
win = import('windows')
|
||||
version_res = win.compile_resources('version.rc',
|
||||
|
|
@ -293,6 +295,11 @@ if 'CONFIG_VNC_SASL' in config_host
|
|||
sasl = declare_dependency(compile_args: config_host['SASL_CFLAGS'].split(),
|
||||
link_args: config_host['SASL_LIBS'].split())
|
||||
endif
|
||||
fdt = not_found
|
||||
if 'CONFIG_FDT' in config_host
|
||||
fdt = declare_dependency(compile_args: config_host['FDT_CFLAGS'].split(),
|
||||
link_args: config_host['FDT_LIBS'].split())
|
||||
endif
|
||||
|
||||
create_config = find_program('scripts/create_config')
|
||||
minikconf = find_program('scripts/minikconf.py')
|
||||
|
|
@ -459,6 +466,7 @@ util_ss = ss.source_set()
|
|||
stub_ss = ss.source_set()
|
||||
trace_ss = ss.source_set()
|
||||
block_ss = ss.source_set()
|
||||
blockdev_ss = ss.source_set()
|
||||
common_ss = ss.source_set()
|
||||
softmmu_ss = ss.source_set()
|
||||
user_ss = ss.source_set()
|
||||
|
|
@ -612,6 +620,31 @@ subdir('nbd')
|
|||
subdir('scsi')
|
||||
subdir('block')
|
||||
|
||||
blockdev_ss.add(files(
|
||||
'blockdev.c',
|
||||
'blockdev-nbd.c',
|
||||
'iothread.c',
|
||||
'job-qmp.c',
|
||||
))
|
||||
|
||||
# os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
|
||||
# os-win32.c does not
|
||||
blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
|
||||
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
|
||||
|
||||
softmmu_ss.add_all(blockdev_ss)
|
||||
softmmu_ss.add(files(
|
||||
'bootdevice.c',
|
||||
'dma-helpers.c',
|
||||
'qdev-monitor.c',
|
||||
), sdl)
|
||||
|
||||
softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
|
||||
softmmu_ss.add(when: 'CONFIG_SECCOMP', if_true: [files('qemu-seccomp.c'), seccomp])
|
||||
softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [files('device_tree.c')])
|
||||
|
||||
common_ss.add(files('cpus-common.c'))
|
||||
|
||||
# needed for fuzzing binaries
|
||||
subdir('tests/qtest/libqos')
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue