From f71eab3ddcdc0e3341dbf1d8b313536cd2f417d1 Mon Sep 17 00:00:00 2001 From: mistermatt2u Date: Wed, 16 Dec 2015 00:06:22 -0500 Subject: [PATCH] Rollback /opt to /usr changes in commit b15bf7d - Apparently macports likes to put includes in /usr/local/include and not /opt/local/include like maybe it should. So we shouldn't change /opt to /usr for the portaudio part of the makefile. This reverts those changes, and (apparently) allows the portaudio portion to compile on 10.11 --- Makefile.macosx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.macosx b/Makefile.macosx index e57813a..3a2888c 100644 --- a/Makefile.macosx +++ b/Makefile.macosx @@ -142,19 +142,19 @@ endif # Use PortAudio Library # Force static linking of portaudio if the static library is available. -PA_LIB_STATIC := $(shell find /usr/local/lib -maxdepth 1 -type f -name "libportaudio.a") +PA_LIB_STATIC := $(shell find /opt/local/lib -maxdepth 1 -type f -name "libportaudio.a") #$(info $$PA_LIB_STATIC is [${PA_LIB_STATIC}]) ifeq (${PA_LIB_STATIC},) -LDLIBS += -L/usr/local/lib -lportaudio +LDLIBS += -L/opt/local/lib -lportaudio else -LDLIBS += /usr/local/lib/libportaudio.a +LDLIBS += /opt/local/lib/libportaudio.a endif # Include libraries portaudio requires. LDLIBS += -framework CoreAudio -framework AudioUnit -framework AudioToolbox LDLIBS += -framework Foundation -framework CoreServices -CFLAGS += -DUSE_PORTAUDIO -I/usr/local/include +CFLAGS += -DUSE_PORTAUDIO -I/opt/local/include # Uncomment following lines to enable GPS interface & tracker function. # Not available for MacOSX.