[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 027/150] meson: add version.o
From: |
Paolo Bonzini |
Subject: |
[PULL 027/150] meson: add version.o |
Date: |
Tue, 18 Aug 2020 10:08:22 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 2a70267eee..7aa5050b58 100644
--- a/meson.build
+++ b/meson.build
@@ -46,8 +46,14 @@ targetos = host_machine.system()
m = cc.find_library('m', required: false)
util = cc.find_library('util', required: false)
socket = []
+version_res = []
if targetos == 'windows'
socket = cc.find_library('ws2_32')
+
+ win = import('windows')
+ version_res = win.compile_resources('version.rc',
+ depend_files:
files('pc-bios/qemu-nsis.ico'),
+ include_directories:
include_directories('.'))
endif
glib = declare_dependency(compile_args: config_host['GLIB_CFLAGS'].split(),
link_args: config_host['GLIB_LIBS'].split())
@@ -232,7 +238,7 @@ libqemuutil = static_library('qemuutil',
sources: util_ss.sources() + stub_ss.sources() +
genh,
dependencies: [util_ss.dependencies(), m, glib,
socket])
qemuutil = declare_dependency(link_with: libqemuutil,
- sources: genh)
+ sources: genh + version_res)
summary_info = {}
summary_info += {'Install prefix': config_host['prefix']}
--
2.26.2
- [PULL 009/150] tests/vm: check for Python YAML parser in the Makefile, (continued)
- [PULL 009/150] tests/vm: check for Python YAML parser in the Makefile, Paolo Bonzini, 2020/08/18
- [PULL 017/150] configure: generate Meson cross file, Paolo Bonzini, 2020/08/18
- [PULL 018/150] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2020/08/18
- [PULL 016/150] configure: integrate Meson in the build system, Paolo Bonzini, 2020/08/18
- [PULL 020/150] meson: move summary to meson.build, Paolo Bonzini, 2020/08/18
- [PULL 021/150] meson: enable pie, Paolo Bonzini, 2020/08/18
- [PULL 022/150] meson: use coverage option, Paolo Bonzini, 2020/08/18
- [PULL 019/150] build-sys: add meson submodule, Paolo Bonzini, 2020/08/18
- [PULL 028/150] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2020/08/18
- [PULL 029/150] tools/virtiofsd: convert to Meson, Paolo Bonzini, 2020/08/18
- [PULL 027/150] meson: add version.o,
Paolo Bonzini <=
- [PULL 030/150] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2020/08/18
- [PULL 034/150] contrib/vhost-user-input: convert to meson, Paolo Bonzini, 2020/08/18
- [PULL 023/150] meson: add sparse support, Paolo Bonzini, 2020/08/18
- [PULL 026/150] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2020/08/18
- [PULL 024/150] meson: add testsuite Makefile generator, Paolo Bonzini, 2020/08/18
- [PULL 031/150] vhost-user-scsi: add compatibility for libiscsi 1.9.0, Paolo Bonzini, 2020/08/18
- [PULL 032/150] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2020/08/18
- [PULL 036/150] contrib/ivshmem: convert to meson, Paolo Bonzini, 2020/08/18
- [PULL 035/150] contrib/vhost-user-gpu: convert to meson, Paolo Bonzini, 2020/08/18
- [PULL 044/150] meson: add qemu-bridge-helper, Paolo Bonzini, 2020/08/18