[gobject-introspection] meson: set a default cairo dll name for the MSVC build
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] meson: set a default cairo dll name for the MSVC build
- Date: Thu, 13 Jun 2019 19:57:40 +0000 (UTC)
commit c996ebf2dbc5b76b69d89e81067eb9ce5a75419f
Author: Christoph Reiter <reiter christoph gmail com>
Date: Thu Jun 13 21:53:51 2019 +0200
meson: set a default cairo dll name for the MSVC build
The cairo MSVC build produces a cairo-gobject.dll unlike the
libcairo-gobject-2.dll with autotools.
While one can pass the right DLL name through the cairo_libname option,
having a better default can't hurt.
gir/meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/gir/meson.build b/gir/meson.build
index dda1173b..99586622 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -2,7 +2,11 @@ cairo_conf = configuration_data()
if get_option('cairo_libname') != ''
cairo_library_name = get_option('cairo_libname')
elif host_machine.system() == 'windows'
- cairo_library_name = 'libcairo-gobject-2.dll'
+ if cc.get_id() == 'msvc'
+ cairo_library_name = 'cairo-gobject.dll'
+ else
+ cairo_library_name = 'libcairo-gobject-2.dll'
+ endif
elif host_machine.system() == 'darwin'
cairo_library_name = 'libcairo-gobject.2.dylib'
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]