diff --git a/Builds/MacOSX/lib/libFLAC.8.dylib b/Builds/MacOSX/lib/libFLAC.8.dylib index 4ae895a..579a1ef 100644 Binary files a/Builds/MacOSX/lib/libFLAC.8.dylib and b/Builds/MacOSX/lib/libFLAC.8.dylib differ diff --git a/Builds/MacOSX/lib/libfluidsynth.1.7.2.dylib b/Builds/MacOSX/lib/libfluidsynth.1.7.2.dylib deleted file mode 100644 index 6a9089d..0000000 Binary files a/Builds/MacOSX/lib/libfluidsynth.1.7.2.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib/libfluidsynth.dylib b/Builds/MacOSX/lib/libfluidsynth.dylib new file mode 100755 index 0000000..148226a Binary files /dev/null and b/Builds/MacOSX/lib/libfluidsynth.dylib differ diff --git a/Builds/MacOSX/lib/libglib-2.0.0.dylib b/Builds/MacOSX/lib/libglib-2.0.0.dylib index bbd94e6..47e8943 100644 Binary files a/Builds/MacOSX/lib/libglib-2.0.0.dylib and b/Builds/MacOSX/lib/libglib-2.0.0.dylib differ diff --git a/Builds/MacOSX/lib/libgthread-2.0.0.dylib b/Builds/MacOSX/lib/libgthread-2.0.0.dylib index 47dc66a..4c375fc 100644 Binary files a/Builds/MacOSX/lib/libgthread-2.0.0.dylib and b/Builds/MacOSX/lib/libgthread-2.0.0.dylib differ diff --git a/Builds/MacOSX/lib/libintl.8.dylib b/Builds/MacOSX/lib/libintl.8.dylib index 3e18c63..c2409a9 100755 Binary files a/Builds/MacOSX/lib/libintl.8.dylib and b/Builds/MacOSX/lib/libintl.8.dylib differ diff --git a/Builds/MacOSX/lib/libogg.0.dylib b/Builds/MacOSX/lib/libogg.0.dylib index fc8dd7a..7d6495e 100644 Binary files a/Builds/MacOSX/lib/libogg.0.dylib and b/Builds/MacOSX/lib/libogg.0.dylib differ diff --git a/Builds/MacOSX/lib/libpcre.1.dylib b/Builds/MacOSX/lib/libpcre.1.dylib index 57a9ffe..a64a45b 100644 Binary files a/Builds/MacOSX/lib/libpcre.1.dylib and b/Builds/MacOSX/lib/libpcre.1.dylib differ diff --git a/Builds/MacOSX/lib/libsndfile.1.dylib b/Builds/MacOSX/lib/libsndfile.1.dylib index 1ce7cdd..68efb44 100644 Binary files a/Builds/MacOSX/lib/libsndfile.1.dylib and b/Builds/MacOSX/lib/libsndfile.1.dylib differ diff --git a/Builds/MacOSX/lib/libvorbis.0.dylib b/Builds/MacOSX/lib/libvorbis.0.dylib index 8d774bb..385a9fb 100644 Binary files a/Builds/MacOSX/lib/libvorbis.0.dylib and b/Builds/MacOSX/lib/libvorbis.0.dylib differ diff --git a/Builds/MacOSX/lib/libvorbisenc.2.dylib b/Builds/MacOSX/lib/libvorbisenc.2.dylib index ddbe066..65117e7 100644 Binary files a/Builds/MacOSX/lib/libvorbisenc.2.dylib and b/Builds/MacOSX/lib/libvorbisenc.2.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libFLAC.8.dylib b/Builds/MacOSX/lib_relinked/libFLAC.8.dylib deleted file mode 100644 index 579a1ef..0000000 Binary files a/Builds/MacOSX/lib_relinked/libFLAC.8.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libfluidsynth.1.7.2.dylib b/Builds/MacOSX/lib_relinked/libfluidsynth.1.7.2.dylib deleted file mode 100644 index cd718f7..0000000 Binary files a/Builds/MacOSX/lib_relinked/libfluidsynth.1.7.2.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libfluidsynth.dylib b/Builds/MacOSX/lib_relinked/libfluidsynth.dylib deleted file mode 120000 index c98db9f..0000000 --- a/Builds/MacOSX/lib_relinked/libfluidsynth.dylib +++ /dev/null @@ -1 +0,0 @@ -libfluidsynth.1.7.2.dylib \ No newline at end of file diff --git a/Builds/MacOSX/lib_relinked/libglib-2.0.0.dylib b/Builds/MacOSX/lib_relinked/libglib-2.0.0.dylib deleted file mode 100644 index 47e8943..0000000 Binary files a/Builds/MacOSX/lib_relinked/libglib-2.0.0.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libgthread-2.0.0.dylib b/Builds/MacOSX/lib_relinked/libgthread-2.0.0.dylib deleted file mode 100644 index 4c375fc..0000000 Binary files a/Builds/MacOSX/lib_relinked/libgthread-2.0.0.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libintl.8.dylib b/Builds/MacOSX/lib_relinked/libintl.8.dylib deleted file mode 100755 index c2409a9..0000000 Binary files a/Builds/MacOSX/lib_relinked/libintl.8.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libogg.0.dylib b/Builds/MacOSX/lib_relinked/libogg.0.dylib deleted file mode 100644 index 7d6495e..0000000 Binary files a/Builds/MacOSX/lib_relinked/libogg.0.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libpcre.1.dylib b/Builds/MacOSX/lib_relinked/libpcre.1.dylib deleted file mode 100644 index 2162eb7..0000000 Binary files a/Builds/MacOSX/lib_relinked/libpcre.1.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libsndfile.1.dylib b/Builds/MacOSX/lib_relinked/libsndfile.1.dylib deleted file mode 100644 index 68efb44..0000000 Binary files a/Builds/MacOSX/lib_relinked/libsndfile.1.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libvorbis.0.dylib b/Builds/MacOSX/lib_relinked/libvorbis.0.dylib deleted file mode 100644 index 385a9fb..0000000 Binary files a/Builds/MacOSX/lib_relinked/libvorbis.0.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libvorbisenc.2.dylib b/Builds/MacOSX/lib_relinked/libvorbisenc.2.dylib deleted file mode 100644 index 65117e7..0000000 Binary files a/Builds/MacOSX/lib_relinked/libvorbisenc.2.dylib and /dev/null differ diff --git a/Builds/MacOSX/relink-build-for-distribution.sh b/Builds/MacOSX/relink-build-for-distribution.sh deleted file mode 100755 index 6df09dd..0000000 --- a/Builds/MacOSX/relink-build-for-distribution.sh +++ /dev/null @@ -1,157 +0,0 @@ -#!/usr/bin/env bash - -# This script used to be used for manually copying -# libs into the target bundle and rewriting the dynamic -# links, to make the bundle portable. -# -# The script is (hopefully) no longer needed, -# because now our builds are portable automatically. -# -# We have a directory of already-linked -# libraries (lib_relinked), which regular builds -# link against and copy into the target bundle. -# -# The contents of lib_relinked were created by doing -# a one-time run of relink_libs.sh upon some libs -# copied out of brew. - -# Ascertain directory in which script lives; compatible with all UNIX -# Thanks to kenorb -# http://stackoverflow.com/a/17744637/5257399 -MYDIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P) -set -o pipefail - -error() { - local parent_lineno="$1" - local message="$2" - local code="${3:-1}" - if [[ -n "$message" ]] ; then - echo "Error on or near line ${parent_lineno}: ${message}; exiting with status ${code}" - else - echo "Error on or near line ${parent_lineno}; exiting with status ${code}" - fi - exit "${code}" -} -trap 'error ${LINENO}' ERR - -#### - -LIBDIR="$MYDIR/lib" -BUILDDIR="$MYDIR/build" -PLUGINNAME="juicysfplugin" - -declare -a BUILDS=("Debug" "Release") -# .app is a special case which has a Plugins folder inside it, containing a .appex Plugin -declare -a TARGETS=("app" \ -"appex" \ -"component" \ -"vst" \ -"vst3" \ -"app/Contents/PlugIns/$PLUGINNAME.appex" -) - -echo "Known builds: ${BUILDS[*]}" -echo "Known targets: ${TARGETS[*]}" - -echo "Build directory: $BUILDDIR" -echo "Lib directory: $LIBDIR" - - -FLUIDSYNTH="libfluidsynth.1.7.2.dylib" -GLIB="libglib-2.0.0.dylib" -GTHREAD="libgthread-2.0.0.dylib" -INTL="libintl.8.dylib" -PCRE="libpcre.1.dylib" - -# all of the following are just for SF3 support... -SNDFILE="libsndfile.1.dylib" -FLAC="libFLAC.8.dylib" -OGG="libogg.0.dylib" -VORBIS="libvorbis.0.dylib" -VORBISENC="libvorbisenc.2.dylib" - -FRAMEWORKLOAD="@loader_path/../Frameworks" - -for i in "${BUILDS[@]}" -do - BUILD="$BUILDDIR/$i" - if [ -d "$BUILD" ]; then - echo "Found $i build subdirectory. Iterating over targets." - for j in "${TARGETS[@]}" - do - CONTENTS="$BUILD/$PLUGINNAME.$j/Contents" - BINARY="$CONTENTS/MacOS/$PLUGINNAME" - if [ -f "$BINARY" ]; then - -echo "Found $j" -echo "Copying libraries into target" -FRAMEWORKS="$CONTENTS/Frameworks" -mkdir -p "$FRAMEWORKS" -cp "$LIBDIR/"* "$FRAMEWORKS/" -# we're gonna relink these frameworks also, so make them writeable -chmod +w "$FRAMEWORKS/"* - -# our $BINARY (Contents/MacOS/juicysfplugin) begins its life linked to a brew-installed fluidsynth library -# which it expects to find at: /usr/local/opt/fluid-synth/lib/libfluidsynth.1.dylib -# we want to change this link to point to the fluidsynth library we copied into: Contents/MacOS/Frameworks/libfluidsynth.1.7.2.dylib -# we tell it to look for it with a relative path: @executable_path/../Frameworks/libfluidsynth.1.7.2.dylib -# and yes, it's fine to point it at our 1.7.2.dylib even though it expects 1.dylib. Because 1.dylib was always a symlink to the more specific version (1.7.2) anyway. -install_name_tool -change /usr/local/opt/fluid-synth/lib/libfluidsynth.1.dylib "$FRAMEWORKLOAD/$FLUIDSYNTH" "$BINARY" - -# changes to our libfluidsynth (depends on glib, gthread, intl): -# change our 1.7.2.dylib to identify itself as 1.dylib, to meet our targets' expectations -install_name_tool -id "$FRAMEWORKLOAD/libfluidsynth.1.dylib" "$FRAMEWORKS/$FLUIDSYNTH" -install_name_tool -change /usr/local/opt/libsndfile/lib/libsndfile.1.dylib "$FRAMEWORKLOAD/$SNDFILE" "$FRAMEWORKS/$FLUIDSYNTH" -install_name_tool -change /usr/local/opt/glib/lib/libglib-2.0.0.dylib "$FRAMEWORKLOAD/$GLIB" "$FRAMEWORKS/$FLUIDSYNTH" -install_name_tool -change /usr/local/opt/glib/lib/libgthread-2.0.0.dylib "$FRAMEWORKLOAD/$GTHREAD" "$FRAMEWORKS/$FLUIDSYNTH" -install_name_tool -change /usr/local/opt/gettext/lib/libintl.8.dylib "$FRAMEWORKLOAD/$INTL" "$FRAMEWORKS/$FLUIDSYNTH" - -# changes to our glib (depends on pcre, intl): -install_name_tool -id "$FRAMEWORKLOAD/$GLIB" "$FRAMEWORKS/$GLIB" -install_name_tool -change /usr/local/opt/pcre/lib/libpcre.1.dylib "$FRAMEWORKLOAD/$PCRE" "$FRAMEWORKS/$GLIB" -install_name_tool -change /usr/local/opt/gettext/lib/libintl.8.dylib "$FRAMEWORKLOAD/$INTL" "$FRAMEWORKS/$GLIB" - -# changes to our gthread (depends on pcre, intl, glib): -# yes, the brew-installed libgthread links directly to brew-installed libglib (unlike fluidsynth, which points at a _symlink_ to the same) -install_name_tool -id "$FRAMEWORKLOAD/$GTHREAD" "$FRAMEWORKS/$GTHREAD" -install_name_tool -change /usr/local/opt/pcre/lib/libpcre.1.dylib "$FRAMEWORKLOAD/$PCRE" "$FRAMEWORKS/$GTHREAD" -install_name_tool -change /usr/local/opt/gettext/lib/libintl.8.dylib "$FRAMEWORKLOAD/$INTL" "$FRAMEWORKS/$GTHREAD" -install_name_tool -change /usr/local/Cellar/glib/2.56.1/lib/libglib-2.0.0.dylib "$FRAMEWORKLOAD/$GLIB" "$FRAMEWORKS/$GTHREAD" - -# changes to our intl: -install_name_tool -id "$FRAMEWORKLOAD/$INTL" "$FRAMEWORKS/$INTL" - -# changes to our pcre: -install_name_tool -id "$FRAMEWORKLOAD/$PCRE" "$FRAMEWORKS/$PCRE" - -# the following are just for SF3 support... -# changes to our libsndfile (depends on FLAC, ogg, vorbis, vorbisenc): -install_name_tool -id "$FRAMEWORKLOAD/$SNDFILE" "$FRAMEWORKS/$SNDFILE" -install_name_tool -change /usr/local/opt/flac/lib/libFLAC.8.dylib "$FRAMEWORKLOAD/$FLAC" "$FRAMEWORKS/$SNDFILE" -install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib "$FRAMEWORKLOAD/$OGG" "$FRAMEWORKS/$SNDFILE" -install_name_tool -change /usr/local/opt/libvorbis/lib/libvorbis.0.dylib "$FRAMEWORKLOAD/$VORBIS" "$FRAMEWORKS/$SNDFILE" -install_name_tool -change /usr/local/opt/libvorbis/lib/libvorbisenc.2.dylib "$FRAMEWORKLOAD/$VORBISENC" "$FRAMEWORKS/$SNDFILE" - -# changes to our FLAC: -install_name_tool -id "$FRAMEWORKLOAD/$FLAC" "$FRAMEWORKS/$FLAC" - -# changes to our ogg: -install_name_tool -id "$FRAMEWORKLOAD/$OGG" "$FRAMEWORKS/$OGG" - -# changes to our vorbis (depends on ogg): -install_name_tool -id "$FRAMEWORKLOAD/$VORBIS" "$FRAMEWORKS/$VORBIS" -install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib "$FRAMEWORKLOAD/$OGG" "$FRAMEWORKS/$VORBIS" - -# changes to our vorbisenc (depends on vorbis, ogg): -install_name_tool -id "$FRAMEWORKLOAD/$VORBISENC" "$FRAMEWORKS/$VORBISENC" -install_name_tool -change /usr/local/Cellar/libvorbis/1.3.6/lib/libvorbis.0.dylib "$FRAMEWORKLOAD/$VORBIS" "$FRAMEWORKS/$VORBISENC" -install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib "$FRAMEWORKLOAD/$OGG" "$FRAMEWORKS/$VORBISENC" - - else - echo "Missing $j; skipping." - fi - done - else - echo "No build directory '$i'. Skipping." - fi -done diff --git a/Builds/MacOSX/relink_libs.sh b/Builds/MacOSX/relink_libs.sh deleted file mode 100755 index 5475615..0000000 --- a/Builds/MacOSX/relink_libs.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/env bash - -# This script does not need to be run in a general -# workflow. I just ran it once upon some brew libs -# that I'd copied into lib_relinked. -# -# As a result: lib_relinked now contains _relinked_ -# binaries, whose install names are relative to @rpath -# (instead of an absolute path provided by brew). -# -# Thus, libraries in lib_relinked are portable, and -# and executable which sets rpath correctly can -# discover them. - -# Ascertain directory in which script lives; compatible with all UNIX -# Thanks to kenorb -# http://stackoverflow.com/a/17744637/5257399 -MYDIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P) -set -o pipefail - -error() { - local parent_lineno="$1" - local message="$2" - local code="${3:-1}" - if [[ -n "$message" ]] ; then - echo "Error on or near line ${parent_lineno}: ${message}; exiting with status ${code}" - else - echo "Error on or near line ${parent_lineno}; exiting with status ${code}" - fi - exit "${code}" -} -trap 'error ${LINENO}' ERR - -#### - -FLUIDSYNTH="libfluidsynth.1.7.2.dylib" -FLUIDSYNTHNOVER="libfluidsynth.dylib" -GLIB="libglib-2.0.0.dylib" -GTHREAD="libgthread-2.0.0.dylib" -INTL="libintl.8.dylib" -PCRE="libpcre.1.dylib" - -# all of the following are just for SF3 support... -SNDFILE="libsndfile.1.dylib" -FLAC="libFLAC.8.dylib" -OGG="libogg.0.dylib" -VORBIS="libvorbis.0.dylib" -VORBISENC="libvorbisenc.2.dylib" - -IDPREFIX="@rpath" -FRAMEWORKLOAD="$IDPREFIX" - -FRAMEWORKS="$MYDIR/lib_relinked" - -cp "$MYDIR/lib"/*.dylib "$FRAMEWORKS/" - -# we're gonna relink these frameworks also, so make them writeable -chmod +w "$FRAMEWORKS/"*.dylib - -# changes to our libfluidsynth (depends on glib, gthread, intl): -# change our x.1.7.2.dylib to identify itself as x.dylib, to meet our targets' expectations -install_name_tool -id "$IDPREFIX/$FLUIDSYNTHNOVER" "$FRAMEWORKS/$FLUIDSYNTH" -install_name_tool -change /usr/local/opt/libsndfile/lib/libsndfile.1.dylib "$FRAMEWORKLOAD/$SNDFILE" "$FRAMEWORKS/$FLUIDSYNTH" -install_name_tool -change /usr/local/opt/glib/lib/libglib-2.0.0.dylib "$FRAMEWORKLOAD/$GLIB" "$FRAMEWORKS/$FLUIDSYNTH" -install_name_tool -change /usr/local/opt/glib/lib/libgthread-2.0.0.dylib "$FRAMEWORKLOAD/$GTHREAD" "$FRAMEWORKS/$FLUIDSYNTH" -install_name_tool -change /usr/local/opt/gettext/lib/libintl.8.dylib "$FRAMEWORKLOAD/$INTL" "$FRAMEWORKS/$FLUIDSYNTH" - -# our linker option -lfluidsynth expects a dylib to exist with no version number in its filename -[ ! -L "$FRAMEWORKS/$FLUIDSYNTHNOVER" ] && ln -s "$FLUIDSYNTH" "$FRAMEWORKS/$FLUIDSYNTHNOVER" - -# changes to our glib (depends on pcre, intl): -install_name_tool -id "$IDPREFIX/$GLIB" "$FRAMEWORKS/$GLIB" -install_name_tool -change /usr/local/opt/pcre/lib/libpcre.1.dylib "$FRAMEWORKLOAD/$PCRE" "$FRAMEWORKS/$GLIB" -install_name_tool -change /usr/local/opt/gettext/lib/libintl.8.dylib "$FRAMEWORKLOAD/$INTL" "$FRAMEWORKS/$GLIB" - -# changes to our gthread (depends on pcre, intl, glib): -# yes, the brew-installed libgthread links directly to brew-installed libglib (unlike fluidsynth, which points at a _symlink_ to the same) -install_name_tool -id "$IDPREFIX/$GTHREAD" "$FRAMEWORKS/$GTHREAD" -install_name_tool -change /usr/local/opt/pcre/lib/libpcre.1.dylib "$FRAMEWORKLOAD/$PCRE" "$FRAMEWORKS/$GTHREAD" -install_name_tool -change /usr/local/opt/gettext/lib/libintl.8.dylib "$FRAMEWORKLOAD/$INTL" "$FRAMEWORKS/$GTHREAD" -install_name_tool -change /usr/local/Cellar/glib/2.56.1/lib/libglib-2.0.0.dylib "$FRAMEWORKLOAD/$GLIB" "$FRAMEWORKS/$GTHREAD" - -# changes to our intl: -install_name_tool -id "$IDPREFIX/$INTL" "$FRAMEWORKS/$INTL" - -# changes to our pcre: -install_name_tool -id "$IDPREFIX/$PCRE" "$FRAMEWORKS/$PCRE" - -# the following are just for SF3 support... -# changes to our libsndfile (depends on FLAC, ogg, vorbis, vorbisenc): -install_name_tool -id "$IDPREFIX/$SNDFILE" "$FRAMEWORKS/$SNDFILE" -install_name_tool -change /usr/local/opt/flac/lib/libFLAC.8.dylib "$FRAMEWORKLOAD/$FLAC" "$FRAMEWORKS/$SNDFILE" -install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib "$FRAMEWORKLOAD/$OGG" "$FRAMEWORKS/$SNDFILE" -install_name_tool -change /usr/local/opt/libvorbis/lib/libvorbis.0.dylib "$FRAMEWORKLOAD/$VORBIS" "$FRAMEWORKS/$SNDFILE" -install_name_tool -change /usr/local/opt/libvorbis/lib/libvorbisenc.2.dylib "$FRAMEWORKLOAD/$VORBISENC" "$FRAMEWORKS/$SNDFILE" - -# changes to our FLAC: -install_name_tool -id "$IDPREFIX/$FLAC" "$FRAMEWORKS/$FLAC" - -# changes to our ogg: -install_name_tool -id "$IDPREFIX/$OGG" "$FRAMEWORKS/$OGG" - -# changes to our vorbis (depends on ogg): -install_name_tool -id "$IDPREFIX/$VORBIS" "$FRAMEWORKS/$VORBIS" -install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib "$FRAMEWORKLOAD/$OGG" "$FRAMEWORKS/$VORBIS" - -# changes to our vorbisenc (depends on vorbis, ogg): -install_name_tool -id "$IDPREFIX/$VORBISENC" "$FRAMEWORKS/$VORBISENC" -install_name_tool -change /usr/local/Cellar/libvorbis/1.3.6/lib/libvorbis.0.dylib "$FRAMEWORKLOAD/$VORBIS" "$FRAMEWORKS/$VORBISENC" -install_name_tool -change /usr/local/opt/libogg/lib/libogg.0.dylib "$FRAMEWORKLOAD/$OGG" "$FRAMEWORKS/$VORBISENC"