Mercurial > hg > vamp-plugin-sdk
changeset 416:3bfc44d26963
OSX install target, + remake configure
| author | Chris Cannam |
|---|---|
| date | Fri, 11 Dec 2015 12:59:21 +0000 |
| parents | 1522e2f6d700 |
| children | fae1ba2cb534 |
| files | Makefile.in build/update-version.sh configure |
| diffstat | 3 files changed, 43 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Fri Sep 04 13:48:28 2015 +0100 +++ b/Makefile.in Fri Dec 11 12:59:21 2015 +0000 @@ -104,16 +104,32 @@ PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=build/vamp-plugin.map -## For OS/X with g++: -#DYNAMIC_LDFLAGS = -dynamiclib -#PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -#SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -#HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) +# Adapt install details when found to be running on OSX (thanks to David O) +uname_S = $(shell uname -s) +ifeq ($(uname_S),Darwin) + + DYNAMIC_LDFLAGS = -dynamiclib + SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) + HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) + PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -exported_symbols_list vamp-plugin.list + + INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.3.6.0.dylib + INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.3.dylib + +# The OS X linker doesn't allow you to request static linkage when +# linking by library search path, if the same library name is found in +# both static and dynamic versions. So if we install both static and +# dynamic, the static library will never be used. That's OK for the +# host SDK, but we do want plugins to get static linkage of the plugin +# SDK. So install the dynamic version under a different name. + INSTALL_SDK_LIBNAME = libvamp-sdk-dynamic.2.6.0.dylib + INSTALL_SDK_LINK_ABI = libvamp-sdk-dynamic.2.dylib + +endif ### End of user-serviceable parts - API_HEADERS = \ $(APIDIR)/vamp.h
--- a/build/update-version.sh Fri Sep 04 13:48:28 2015 +0100 +++ b/build/update-version.sh Fri Dec 11 12:59:21 2015 +0000 @@ -42,6 +42,12 @@ $p 's/(INSTALL_SDK_LINK_ABI\s*=\s*libvamp-sdk.so).*/$1.'$sdkmajor'/' \ Makefile.in +$p 's/(INSTALL_SDK_LIBNAME\s*=\s*libvamp-sdk-dynamic).*.dylib/$1.'$sdkmajor'.'$sdkminor'.0.dylib/' \ + Makefile.in + +$p 's/(INSTALL_SDK_LINK_ABI\s*=\s*libvamp-sdk-dynamic).*.dylib/$1.'$sdkmajor'.dylib/' \ + Makefile.in + $p 's/(current)=.*/$1='$sdkmajor'/' \ build/libvamp-sdk.la.in @@ -54,6 +60,12 @@ $p 's/(INSTALL_HOSTSDK_LINK_ABI\s*=\s*libvamp-hostsdk.so).*/$1.'$hostmajor'/' \ Makefile.in +$p 's/(INSTALL_HOSTSDK_LIBNAME\s*=\s*libvamp-hostsdk).*.dylib/$1.'$hostmajor'.'$hostminor'.0.dylib/' \ + Makefile.in + +$p 's/(INSTALL_HOSTSDK_LINK_ABI\s*=\s*libvamp-hostsdk).*.dylib/$1.'$hostmajor'.dylib/' \ + Makefile.in + $p 's/(current)=.*/$1='$hostmajor'/' \ build/libvamp-hostsdk.la.in
--- a/configure Fri Sep 04 13:48:28 2015 +0100 +++ b/configure Fri Dec 11 12:59:21 2015 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for vamp-plugin-sdk 2.5. +# Generated by GNU Autoconf 2.69 for vamp-plugin-sdk 2.6. # # Report bugs to <cannam@all-day-breakfast.com>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='vamp-plugin-sdk' PACKAGE_TARNAME='vamp-plugin-sdk' -PACKAGE_VERSION='2.5' -PACKAGE_STRING='vamp-plugin-sdk 2.5' +PACKAGE_VERSION='2.6' +PACKAGE_STRING='vamp-plugin-sdk 2.6' PACKAGE_BUGREPORT='cannam@all-day-breakfast.com' PACKAGE_URL='' @@ -1243,7 +1243,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vamp-plugin-sdk 2.5 to adapt to many kinds of systems. +\`configure' configures vamp-plugin-sdk 2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1304,7 +1304,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vamp-plugin-sdk 2.5:";; + short | recursive ) echo "Configuration of vamp-plugin-sdk 2.6:";; esac cat <<\_ACEOF @@ -1402,7 +1402,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vamp-plugin-sdk configure 2.5 +vamp-plugin-sdk configure 2.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1651,7 +1651,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vamp-plugin-sdk $as_me 2.5, which was +It was created by vamp-plugin-sdk $as_me 2.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4505,7 +4505,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vamp-plugin-sdk $as_me 2.5, which was +This file was extended by vamp-plugin-sdk $as_me 2.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4558,7 +4558,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vamp-plugin-sdk config.status 2.5 +vamp-plugin-sdk config.status 2.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"