[libgit2-glib/wip/meson] Fixes



commit 17b60eb59de5c74265e4ecd8fdad26de4440700c
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Thu Dec 29 15:47:07 2016 +0100

    Fixes

 libgit2-glib/meson.build |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/libgit2-glib/meson.build b/libgit2-glib/meson.build
index 7609564..352b7e0 100644
--- a/libgit2-glib/meson.build
+++ b/libgit2-glib/meson.build
@@ -145,9 +145,9 @@ pkgconfig_files = [ 'libgit2-glib-@0@'.format(libgit2_glib_api_version) ]
 platform_deps = [ gobject, libgit2 ]
 
 if cc.get_id() == 'msvc'
-  graphene_link_args = []
+  libgit2_glib_link_args = []
 else
-  graphene_link_args = [ '-Wl,-Bsymbolic-functions' ]
+  libgit2_glib_link_args = [ '-Wl,-Bsymbolic-functions' ]
 endif
 
 libgit2_glib = shared_library('libgit2-glib-@0@'.format(libgit2_glib_api_version),
@@ -160,13 +160,12 @@ libgit2_glib = shared_library('libgit2-glib-@0@'.format(libgit2_glib_api_version
             '-DG_LOG_DOMAIN="Ggit"',
             '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_30',
             '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32' ],
-  link_args: graphene_link_args)
+  link_args: libgit2_glib_link_args)
 
 if build_gir
   gir_extra_args = [
     '--identifier-filter-cmd=' + join_paths(meson.current_source_dir(), 'identfilter.py'),
-    '--c-include=ggit.h',
-    '-DGRAPHENE_COMPILATION',
+    '--c-include=ggit.h'
   ]
   gnome.generate_gir(libgit2_glib,
                      sources: headers + sources,
@@ -174,7 +173,7 @@ if build_gir
                      nsversion: libgit2_glib_api_version,
                      identifier_prefix: 'Ggit',
                      symbol_prefix: 'ggit',
-                     includes: [ 'GObject-2.0' ],
+                     includes: [ 'GObject-2.0', 'GLib-2.0', 'Gio-2.0' ],
                      install: true,
                      extra_args: gir_extra_args)
 endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]