05.11.2021 06:20, LIU Zhiwei wrote:
...
diff --git a/meson.build b/meson.build
index 47df10afc2..26195cb24f 100644
...
@@ -2800,14 +2800,15 @@ common_ss.add(hwcore)
###########
# Targets #
###########
-
-foreach m : block_mods + softmmu_mods
- shared_module(m.name(),
- name_prefix: '',
- link_whole: m,
- install: true,
- install_dir: qemu_moddir)
-endforeach
+if targetos != 'windows'
+ foreach m : block_mods + softmmu_mods
+ shared_module(m.name(),
+ name_prefix: '',
+ link_whole: m,
+ install: true,
+ install_dir: qemu_moddir)
+ endforeach
+endif
softmmu_ss.add(authz, blockdev, chardev, crypto, io, qmp)
common_ss.add(qom, qemuutil)
@@ -2826,6 +2827,7 @@ common_all = static_library('common',
feature_to_c = find_program('scripts/feature_to_c.sh')
emulators = {}
+emulator = 0
mm...
...
@@ -3023,6 +3026,17 @@ foreach target : target_dirs
endif
endforeach
endforeach
+if (targetos == 'windows')
+ foreach m : block_mods + softmmu_mods
+ shared_module(m.name(),
+ name_prefix: '',
+ link_whole: m,
+ install: true,
+ dependencies: glib,
+ link_with: emulator,
+ install_dir: qemu_moddir)
+ endforeach
+endif
Now we have two almost-identical blocks in different places.
Can we either move them closer to each other or combine them into one?
Thanks!
/mjt
