Drop qxl object from softmmu source set, it is built as module.
Also drop CONFIG_QXL condition from qxl_ss.add. First because it is
pointless, the whole thing is wrapped into "has_key('CONFIG_QXL')".
Second because it doesn't work for some reason. Looks like the source
files are not added to the set for some reason and we end up with an
empty hw-display-qxl.so.
Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
hw/display/meson.build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/display/meson.build b/hw/display/meson.build
index 78adaf9db463..becbedd24c23 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -41,12 +41,10 @@ specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c'))
if config_all_devices.has_key('CONFIG_QXL')
qxl_ss = ss.source_set()
- qxl_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c',
'qxl-render.c'))
+ qxl_ss.add(files('qxl.c', 'qxl-logger.c', 'qxl-render.c'))
hw_display_modules += {'qxl': qxl_ss}
endif
-softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c',
'qxl-render.c'))
-
softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c'))
softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
--
2.27.0
