From cff5bf0275ba5cc1fd34d5c869d94cd75e0bead6 Mon Sep 17 00:00:00 2001
From: Sojourner Truth <jon.w.wilkes@gmail.com>
Date: Fri, 22 Jul 2016 19:05:13 -0400
Subject: [PATCH] apply Matt Barber's patches for building on OSX: Changed
LDFLAGS to point to pd-l2ork rather than pd
---
externals/OSCx/configure.ac | 2 +-
externals/miXed/Makefile.common | 2 +-
externals/miXed/cyclone/Makefile.libdir | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/externals/OSCx/configure.ac b/externals/OSCx/configure.ac
index 4c4c37b2f..781ddc8ff 100644
--- a/externals/OSCx/configure.ac
+++ b/externals/OSCx/configure.ac
@@ -116,7 +116,7 @@ else
;;
*-*-darwin*)
CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 "
- LDFLAGS=" -bundle -bundle_loader ../../../pd/bin/pd -flat_namespace "
+ LDFLAGS=" -bundle -bundle_loader ../../../pd/bin/pd-l2ork -flat_namespace "
pd_suffix=pd_darwin
LIBS="-lc -lm"
;;
diff --git a/externals/miXed/Makefile.common b/externals/miXed/Makefile.common
index c8dcdc241..17dbf3146 100644
--- a/externals/miXed/Makefile.common
+++ b/externals/miXed/Makefile.common
@@ -63,7 +63,7 @@ DEFINES = -DUNIX -DMACOSX
OPT_CFLAGS = -O2 -funroll-loops -fomit-frame-pointer
# perhaps "-undefined suppress" would be a better choice, when we go dynamic
# with our own common code? (not likely to happen soon...)
-LFLAGS = -bundle -bundle_loader $(PD_DIR)/../bin/pd -flat_namespace
+LFLAGS = -bundle -bundle_loader $(PD_DIR)/../bin/pd-l2ork -flat_namespace
endif
SHARED_DIR = $(ROOT_DIR)/shared
diff --git a/externals/miXed/cyclone/Makefile.libdir b/externals/miXed/cyclone/Makefile.libdir
index 968ea718c..6eff7ec86 100644
--- a/externals/miXed/cyclone/Makefile.libdir
+++ b/externals/miXed/cyclone/Makefile.libdir
@@ -46,7 +46,7 @@ ifeq ($(UNAME),Darwin)
CFLAGS += $(FAT_FLAGS) -fPIC -I/sw/include
LDFLAGS += $(FAT_FLAGS) -bundle -undefined dynamic_lookup -L/sw/lib
# if the 'pd' binary exists, check the linking against it to aid with stripping
- LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd && echo -bundle_loader $(PD_PATH)/bin/pd)
+ LDFLAGS += $(shell test -e $(PD_PATH)/bin/pd-l2ork && echo -bundle_loader $(PD_PATH)/bin/pd-l2ork)
LIBS += -lc
STRIP = strip -x
# install into ~/Library/Pd on Mac OS X since /usr/local isn't used much
--
GitLab