diff --git a/gdk/meson.build b/gdk/meson.build index 6a75a9fed5..0d88e8e45a 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -269,6 +269,7 @@ libgdk = shared_library('gdk-3', ] + common_cflags, link_whole: gdk_backends, link_args: common_ldflags, + darwin_versions : gtk_osxversions, install: true) libgdk_dep = declare_dependency( diff --git a/gtk/meson.build b/gtk/meson.build index b527f136f0..531f2e962f 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -897,6 +897,7 @@ libgtk = shared_library('gtk-3', dependencies: gtk_deps + [libgdk_dep], link_with: libgdk, link_args: common_ldflags, + darwin_versions : gtk_osxversions, install: true) gtk_dep_sources = [gtkversion, gtktypebuiltins_h] diff --git a/meson.build b/meson.build index 06cf577d47..f0ed6216a3 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('gtk+-3.0', 'c', 'c_std=gnu89', 'warning_level=1' ], - meson_version : '>= 0.43.0', + meson_version : '>= 0.48.0', license: 'LGPLv2.1+') glib_major_req = 2 @@ -79,6 +79,7 @@ gtk_binary_version = '3.0.0' gtk_binary_age = 100 * gtk_minor_version + gtk_micro_version gtk_soversion = '0.@0@.@1@'.format(gtk_binary_age - gtk_interface_age, gtk_interface_age) +gtk_osxversions = [(100 * gtk_minor_version) + 1, '@0@.@1@.0'.format((100 * gtk_minor_version) + 1, gtk_micro_version)] gtk_api_version = '@0@.0'.format(gtk_major_version) @@ -286,12 +287,6 @@ if os_unix and not os_darwin endforeach endif -# Maintain compatibility with autotools -if os_darwin - common_ldflags += [ '-compatibility_version 1', '-current_version 1.0', ] -endif - - confinc = include_directories('.') gdkinc = include_directories('gdk') gtkinc = include_directories('gtk')