From 69caaa3254797e5a08d98b211774adb24451fb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Wed, 18 Mar 2020 18:54:35 -0400 Subject: Update GLib dep to somewhat ancient 2.32 --- README | 2 +- meson.build | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README b/README index a723de1..772c412 100644 --- a/README +++ b/README @@ -6,4 +6,4 @@ It is supposed to have a very simple API. Read the gtk-doc. The only dependencies are: - GUPnP 1.2 - - GLib 2.26 + - GLib 2.32 diff --git a/meson.build b/meson.build index 6306588..d6bde90 100644 --- a/meson.build +++ b/meson.build @@ -3,14 +3,22 @@ project('gupnp-igd', 'c', version: '0.2.5') gnome = import('gnome') pkg = import('pkgconfig') +glib_req = '>= 2.32' dependencies = [ - dependency('glib-2.0', version: '>= 2.26', required: true), - dependency('gobject-2.0', version: '>= 2.26', required: true), - dependency('gupnp-1.2', version : '>= 1.1.0'), - dependency('gssdp-1.2', version : '>= 1.1.0'), + dependency('glib-2.0', version: glib_req, required: true), + dependency('gobject-2.0', version: glib_req, required: true), + dependency('gupnp-1.2', version : '>= 1.2.0'), + dependency('gssdp-1.2', version : '>= 1.2.0'), dependency('gthread-2.0', required: true) ] +glib_req_minmax_str = glib_req.split().get(1).underscorify() +add_project_arguments( + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_' + glib_req_minmax_str, + '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_' + glib_req_minmax_str, + language: 'c') + + subdir('libgupnp-igd') subdir('tests') if get_option('gtk_doc') -- cgit v1.2.1