[gobject-introspection/gnome-3-32] meson: set a default cairo dll name for the MSVC build



commit 5a72f0f65c033252b00bd97c13379dd6b986ad6a
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 c77ee6dd..83ee666d 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]