diff --git a/Builds/MacOSX/juicysfplugin.xcodeproj/project.pbxproj b/Builds/MacOSX/juicysfplugin.xcodeproj/project.pbxproj index a8edacb..738d045 100644 --- a/Builds/MacOSX/juicysfplugin.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/juicysfplugin.xcodeproj/project.pbxproj @@ -918,6 +918,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../lib"; PRODUCT_NAME = juicysfplugin; WARNING_CFLAGS = "-Wreorder"; ZERO_LINK = NO; @@ -1178,6 +1179,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../lib"; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = juicysfplugin; WARNING_CFLAGS = "-Wreorder"; diff --git a/Builds/MacOSX/lib_relinked/libFLAC.8.dylib b/Builds/MacOSX/lib_relinked/libFLAC.8.dylib index a8a78dc..579a1ef 100644 Binary files a/Builds/MacOSX/lib_relinked/libFLAC.8.dylib and b/Builds/MacOSX/lib_relinked/libFLAC.8.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libfluidsynth.1.7.2.dylib b/Builds/MacOSX/lib_relinked/libfluidsynth.1.7.2.dylib new file mode 100644 index 0000000..cd718f7 Binary files /dev/null and b/Builds/MacOSX/lib_relinked/libfluidsynth.1.7.2.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libfluidsynth.dylib b/Builds/MacOSX/lib_relinked/libfluidsynth.dylib deleted file mode 100644 index 37bd4c6..0000000 Binary files a/Builds/MacOSX/lib_relinked/libfluidsynth.dylib and /dev/null differ diff --git a/Builds/MacOSX/lib_relinked/libfluidsynth.dylib b/Builds/MacOSX/lib_relinked/libfluidsynth.dylib new file mode 120000 index 0000000..c98db9f --- /dev/null +++ b/Builds/MacOSX/lib_relinked/libfluidsynth.dylib @@ -0,0 +1 @@ +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 index b695fc0..47e8943 100644 Binary files a/Builds/MacOSX/lib_relinked/libglib-2.0.0.dylib and b/Builds/MacOSX/lib_relinked/libglib-2.0.0.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libgthread-2.0.0.dylib b/Builds/MacOSX/lib_relinked/libgthread-2.0.0.dylib index 2c0079a..4c375fc 100644 Binary files a/Builds/MacOSX/lib_relinked/libgthread-2.0.0.dylib and b/Builds/MacOSX/lib_relinked/libgthread-2.0.0.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libintl.8.dylib b/Builds/MacOSX/lib_relinked/libintl.8.dylib index d8c9ccc..c2409a9 100755 Binary files a/Builds/MacOSX/lib_relinked/libintl.8.dylib and b/Builds/MacOSX/lib_relinked/libintl.8.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libogg.0.dylib b/Builds/MacOSX/lib_relinked/libogg.0.dylib index 44c3fc8..7d6495e 100644 Binary files a/Builds/MacOSX/lib_relinked/libogg.0.dylib and b/Builds/MacOSX/lib_relinked/libogg.0.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libpcre.1.dylib b/Builds/MacOSX/lib_relinked/libpcre.1.dylib index d7099e2..2162eb7 100644 Binary files a/Builds/MacOSX/lib_relinked/libpcre.1.dylib and b/Builds/MacOSX/lib_relinked/libpcre.1.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libsndfile.1.dylib b/Builds/MacOSX/lib_relinked/libsndfile.1.dylib index c0eb699..68efb44 100644 Binary files a/Builds/MacOSX/lib_relinked/libsndfile.1.dylib and b/Builds/MacOSX/lib_relinked/libsndfile.1.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libvorbis.0.dylib b/Builds/MacOSX/lib_relinked/libvorbis.0.dylib index 3e6aed6..385a9fb 100644 Binary files a/Builds/MacOSX/lib_relinked/libvorbis.0.dylib and b/Builds/MacOSX/lib_relinked/libvorbis.0.dylib differ diff --git a/Builds/MacOSX/lib_relinked/libvorbisenc.2.dylib b/Builds/MacOSX/lib_relinked/libvorbisenc.2.dylib index 90866f9..65117e7 100644 Binary files a/Builds/MacOSX/lib_relinked/libvorbisenc.2.dylib and b/Builds/MacOSX/lib_relinked/libvorbisenc.2.dylib differ diff --git a/Builds/MacOSX/relink_libs.sh b/Builds/MacOSX/relink_libs.sh index 8ceef51..5475615 100755 --- a/Builds/MacOSX/relink_libs.sh +++ b/Builds/MacOSX/relink_libs.sh @@ -34,6 +34,7 @@ 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" @@ -46,22 +47,27 @@ OGG="libogg.0.dylib" VORBIS="libvorbis.0.dylib" VORBISENC="libvorbisenc.2.dylib" -IDPREFIX="@rpath/lib" +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/"* +chmod +w "$FRAMEWORKS/"*.dylib # 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 "$IDPREFIX/libfluidsynth.1.dylib" "$FRAMEWORKS/$FLUIDSYNTH" +# 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"