[gobject-introspection/wip/meson] meson: Fix cairo library name in cairo-1.0.gir on Windows



commit 8eab66925af3f2b2e32658f717d49d79b3e94e65
Author: Christoph Reiter <creiter src gnome org>
Date:   Wed Mar 7 13:58:33 2018 +0100

    meson: Fix cairo library name in cairo-1.0.gir on Windows
    
    host_machine.system() returns "windows" on Windows and not "win32".
    Also add the dll name used with gvsbuild/msvc.

 gir/meson.build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gir/meson.build b/gir/meson.build
index a4c84c94..c4d8b809 100644
--- a/gir/meson.build
+++ b/gir/meson.build
@@ -1,8 +1,12 @@
 cairo_conf = configuration_data()
 if get_option('cairo-libname') != ''
   cairo_library_name = get_option('cairo-libname')
-elif host_machine.system() == 'win32'
-  cairo_library_name = 'libcairo-gobject-2.dll'
+elif host_machine.system() == 'windows'
+  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]