diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2020-07-22 00:31:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 00:31:18 +0100 |
| commit | 23f40491834026df1dc5b048c45892c59f64762f (patch) | |
| tree | ac27f225f268475bf171372a551f98b8d6e9ae61 | |
| parent | a1918874061fcea5da1739cffad55e4c3ae283c6 (diff) | |
| parent | f91fb0a0b6c05ea43070201892372d225e5c8f50 (diff) | |
| download | libepoxy-23f40491834026df1dc5b048c45892c59f64762f.tar.gz | |
Merge pull request #225 from anholt/darwin_versions
Use the darwin_versions argument
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 47d3997..c5474e0 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('libepoxy', 'c', version: '1.5.5', 'warning_level=1', ], license: 'MIT', - meson_version: '>= 0.46.0') + meson_version: '>= 0.48.0') epoxy_version = meson.project_version().split('.') epoxy_major_version = epoxy_version[0].to_int() diff --git a/src/meson.build b/src/meson.build index 371fd4b..881e087 100644 --- a/src/meson.build +++ b/src/meson.build @@ -53,9 +53,7 @@ if host_system == 'linux' and cc.get_id() == 'gcc' endif # Maintain compatibility with autotools; see: https://github.com/anholt/libepoxy/issues/108 -if host_system == 'darwin' - common_ldflags += [ '-compatibility_version 1', '-current_version 1.0', ] -endif +darwin_versions = [1, '1.0'] epoxy_deps = [ dl_dep, ] if host_system == 'windows' @@ -66,6 +64,7 @@ libepoxy = library( 'epoxy', sources: epoxy_sources + epoxy_headers, version: '0.0.0', + darwin_versions: darwin_versions, install: true, dependencies: epoxy_deps, include_directories: libepoxy_inc, |