[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 028/152] meson: add version.o
From: |
Paolo Bonzini |
Subject: |
[PULL v8 028/152] meson: add version.o |
Date: |
Fri, 21 Aug 2020 06:21:25 -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 4e9eb5da5c..feb3c8a30c 100644
--- a/meson.build
+++ b/meson.build
@@ -49,8 +49,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())
@@ -235,7 +241,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 v8 016/152] configure: add support for pseudo-"in source tree" builds, (continued)
- [PULL v8 016/152] configure: add support for pseudo-"in source tree" builds, Paolo Bonzini, 2020/08/21
- [PULL v8 014/152] configure: prepare CFLAGS/CXXFLAGS/LDFLAGS for Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 019/152] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2020/08/21
- [PULL v8 018/152] configure: generate Meson cross file, Paolo Bonzini, 2020/08/21
- [PULL v8 022/152] meson: enable pie, Paolo Bonzini, 2020/08/21
- [PULL v8 021/152] meson: move summary to meson.build, Paolo Bonzini, 2020/08/21
- [PULL v8 020/152] build-sys: add meson submodule, Paolo Bonzini, 2020/08/21
- [PULL v8 025/152] meson: add testsuite Makefile generator, Paolo Bonzini, 2020/08/21
- [PULL v8 024/152] meson: add sparse support, Paolo Bonzini, 2020/08/21
- [PULL v8 023/152] meson: use coverage option, Paolo Bonzini, 2020/08/21
- [PULL v8 028/152] meson: add version.o,
Paolo Bonzini <=
- [PULL v8 027/152] meson: add remaining generated tcg trace helpers, Paolo Bonzini, 2020/08/21
- [PULL v8 029/152] contrib/libvhost-user: convert to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 017/152] configure: integrate Meson in the build system, Paolo Bonzini, 2020/08/21
- [PULL v8 031/152] contrib/vhost-user-blk: convert to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 026/152] libqemuutil, qapi, trace: convert to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 030/152] tools/virtiofsd: convert to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 032/152] vhost-user-scsi: add compatibility for libiscsi 1.9.0, Paolo Bonzini, 2020/08/21
- [PULL v8 033/152] contrib/vhost-user-scsi: convert to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 037/152] contrib/ivshmem: convert to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 035/152] contrib/vhost-user-input: convert to meson, Paolo Bonzini, 2020/08/21