[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 026/147] meson: add version.o
From: |
Paolo Bonzini |
Subject: |
[PATCH 026/147] meson: add version.o |
Date: |
Mon, 10 Aug 2020 19:07:04 +0200 |
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 e1ea8ce..11b0887 100644
--- a/meson.build
+++ b/meson.build
@@ -45,8 +45,14 @@ targetos = host_machine.system()
m = cc.find_library('m', required: false)
util = cc.find_library('util', required: false)
socket = []
+version_res = []
if host_machine.system() == '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())
@@ -231,7 +237,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']}
--
1.8.3.1
- [PATCH 017/147] build-sys hack: link with whole .fa archives, (continued)
- [PATCH 017/147] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2020/08/10
- [PATCH 016/147] configure: generate Meson cross file, Paolo Bonzini, 2020/08/10
- [PATCH 018/147] build-sys: add meson submodule, Paolo Bonzini, 2020/08/10
- [PATCH 019/147] meson: move summary to meson.build, Paolo Bonzini, 2020/08/10
- [PATCH 020/147] meson: enable pie, Paolo Bonzini, 2020/08/10
- [PATCH 021/147] meson: use coverage option, Paolo Bonzini, 2020/08/10
- [PATCH 022/147] meson: add sparse support, Paolo Bonzini, 2020/08/10
- [PATCH 023/147] meson: add testsuite Makefile generator, Paolo Bonzini, 2020/08/10
- [PATCH 025/147] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2020/08/10
- [PATCH 024/147] libqemuutil, qapi, trace: convert to meson, Paolo Bonzini, 2020/08/10
- [PATCH 026/147] meson: add version.o,
Paolo Bonzini <=
- [PATCH 027/147] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2020/08/10
- [PATCH 030/147] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2020/08/10
- [PATCH 029/147] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2020/08/10
- [PATCH 031/147] contrib/rdmacm-mux: convert to Meson, Paolo Bonzini, 2020/08/10
- [PATCH 028/147] tools/virtiofsd: convert to Meson, Paolo Bonzini, 2020/08/10
- [PATCH 032/147] contrib/vhost-user-input: convert to meson, Paolo Bonzini, 2020/08/10
- [PATCH 033/147] contrib/vhost-user-gpu: convert to meson, Paolo Bonzini, 2020/08/10
- [PATCH 034/147] contrib/ivshmem: convert to meson, Paolo Bonzini, 2020/08/10
- [PATCH 035/147] contrib/elf2dmp: convert to meson, Paolo Bonzini, 2020/08/10
- [PATCH 037/147] meson: convert vss-win32, Paolo Bonzini, 2020/08/10