Commit bbd52841 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

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
parent c1199a0c
Pipeline #268 passed with stage
in 133 minutes and 2 seconds
......@@ -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" && \
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment