From bbd5284156470884c58b7beb218f63c97980d9d9 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Mon, 3 Oct 2016 22:31:57 -0400
Subject: [PATCH] some adjustments to get OSX to build: * add flag for
compatibility with older OSX versions * change library paths in script so
that external dependencies are found * build with jack support
---
packages/darwin_app/Makefile | 4 +++-
.../darwin_app/embed-MacOSX-dependencies.sh | 18 +++++++++---------
pd/src/configure.ac | 4 ++--
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index abdcae562..a7fe2a7c0 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -29,6 +29,8 @@ WISH_CONTENTS = "$(WISH)/Contents"
OPT_CFLAGS = -fast -fPIC -ftree-vectorize
FAT_FLAGS = -mmacosx-version-min=10.4
+CFLAGS = -mmacosx-version-min=10.4
+LDFLAGS = -mmacosx-version-min=10.4
# which CPU to compile for
TARGET_PLATFORM := $(shell uname -p)
@@ -184,7 +186,7 @@ readme_install:
#------------------------------------------------------------------------------#
darwin_app_core: darwin_app_wrapper
$(MAKE) -C $(packages_src) $(DEST_PATHS) \
- PD_CONFIGURE_FLAGS="--enable-jack=no --disable-fat" \
+ PD_CONFIGURE_FLAGS="--enable-jack --disable-fat" \
pd_install
install -d "$(PD_APP_CONTENTS)/Resources/bin"
cd "$(PD_APP_CONTENTS)/Resources" && \
diff --git a/packages/darwin_app/embed-MacOSX-dependencies.sh b/packages/darwin_app/embed-MacOSX-dependencies.sh
index 3eea432b8..5fbef99f6 100755
--- a/packages/darwin_app/embed-MacOSX-dependencies.sh
+++ b/packages/darwin_app/embed-MacOSX-dependencies.sh
@@ -30,9 +30,9 @@ for pd_darwin in `find $PD_APP_CONTENTS -name '*.pd_darwin'`; do
install -d $PD_APP_LIB
install -p /opt/local/lib/$lib $PD_APP_LIB
new_lib=`echo $lib | sed 's|.*/\(.*\.dylib\)|\1|'`
- # @executable_path starts from Contents/Resources/bin/pd
- install_name_tool -id @executable_path/../../$LIB_DIR/$new_lib $PD_APP_LIB/$new_lib
- install_name_tool -change /opt/local/lib/$lib @executable_path/../../$LIB_DIR/$new_lib $pd_darwin
+ # @executable_path starts from Contents/Resources/app.nw/bin/pd
+ install_name_tool -id @executable_path/../../../$LIB_DIR/$new_lib $PD_APP_LIB/$new_lib
+ install_name_tool -change /opt/local/lib/$lib @executable_path/../../../$LIB_DIR/$new_lib $pd_darwin
done
echo " "
fi
@@ -52,7 +52,7 @@ for so in $PD_APP_LIB/*/*.so; do
install -vp /opt/local/lib/$lib $PD_APP_LIB
fi
# @executable_path starts from Contents/Resources/bin/pd
- install_name_tool -change /opt/local/lib/$lib @executable_path/../../$LIB_DIR/$new_lib $so
+ install_name_tool -change /opt/local/lib/$lib @executable_path/../../../$LIB_DIR/$new_lib $so
done
echo " "
fi
@@ -71,8 +71,8 @@ for dylib in $PD_APP_LIB/*.dylib; do
install -vp /opt/local/lib/$lib $PD_APP_LIB
fi
# @executable_path starts from Contents/Resources/bin/pd
- install_name_tool -id @executable_path/../../$LIB_DIR/$new_lib $PD_APP_LIB/$new_lib
- install_name_tool -change /opt/local/lib/$lib @executable_path/../../$LIB_DIR/$new_lib $dylib
+ install_name_tool -id @executable_path/../../../$LIB_DIR/$new_lib $PD_APP_LIB/$new_lib
+ install_name_tool -change /opt/local/lib/$lib @executable_path/../../../$LIB_DIR/$new_lib $dylib
done
echo " "
fi
@@ -91,9 +91,9 @@ for dylib in $PD_APP_LIB/*.dylib; do
else
install -vp /opt/local/lib/$lib $PD_APP_LIB
fi
- # @executable_path starts from Contents/Resources/bin/pd
- install_name_tool -id @executable_path/../../$LIB_DIR/$new_lib $PD_APP_LIB/$new_lib
- install_name_tool -change /opt/local/lib/$lib @executable_path/../../$LIB_DIR/$new_lib $dylib
+ # @executable_path starts from Contents/Resources/app.nw/bin/pd
+ install_name_tool -id @executable_path/../../../$LIB_DIR/$new_lib $PD_APP_LIB/$new_lib
+ install_name_tool -change /opt/local/lib/$lib @executable_path/../../../$LIB_DIR/$new_lib $dylib
done
echo " "
fi
diff --git a/pd/src/configure.ac b/pd/src/configure.ac
index 77e491283..419f34e6c 100644
--- a/pd/src/configure.ac
+++ b/pd/src/configure.ac
@@ -263,11 +263,11 @@ then
OSNUMBER=2
if test x$jack = "xyes";
then
- LDFLAGS=$LDFLAGS" -weak_framework Jackmp"
+ LDFLAGS=$LDFLAGS" -ljack"
fi
if test x$jack = "xrun";
then
- LDFLAGS=$LDFLAGS" -weak_framework Jackmp"
+ LDFLAGS=$LDFLAGS" -ljack"
fi
fi
--
GitLab