From 9a98aed96e1c9252820fc67507265152fb6eb7f9 Mon Sep 17 00:00:00 2001 From: Jonathan Dahan Date: Mon, 1 Oct 2018 14:15:42 -0400 Subject: [PATCH] macOS: use INSTALLDIR in makefile to find libraries --- Makefile.macosx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Makefile.macosx b/Makefile.macosx index 2aca917..0aeab1f 100644 --- a/Makefile.macosx +++ b/Makefile.macosx @@ -24,6 +24,13 @@ # 3. Removed fsk_fast_filter.h from atest receipe, clang compiler was having # a hissy fit. Not check with GCC. +# Where should we install it? +# Looks for libraries and includes, default is Homebrew +INSTALLDIR := /usr/local + +# To use Macports, uncomment this line +#INSTALLDIR := /opt/local + APPS := direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients atest log2gpx gen_packets ttcalc kissutil all : $(APPS) direwolf.conf @@ -91,19 +98,19 @@ endif # Use PortAudio Library # Force static linking of portaudio if the static library is available. -PA_LIB_STATIC := $(shell find /opt/local/lib -maxdepth 1 -type f -name "libportaudio.a") +PA_LIB_STATIC := $(shell find $(INSTALLDIR)/lib -maxdepth 1 -type f -name "libportaudio.a") #$(info $$PA_LIB_STATIC is [${PA_LIB_STATIC}]) ifeq (${PA_LIB_STATIC},) -LDLIBS += -L/opt/local/lib -lportaudio +LDLIBS += -L$(INSTALLDIR)/lib -lportaudio else -LDLIBS += /opt/local/lib/libportaudio.a +LDLIBS += $(INSTALLDIR)/lib/libportaudio.a endif # Include libraries portaudio requires. LDLIBS += -framework CoreAudio -framework AudioUnit -framework AudioToolbox LDLIBS += -framework Foundation -framework CoreServices -CFLAGS += -DUSE_PORTAUDIO -I/opt/local/include +CFLAGS += -DUSE_PORTAUDIO -I$(INSTALLDIR)/include # Uncomment following lines to enable GPS interface & tracker function. # Not available for MacOSX (as far as I know). @@ -112,12 +119,12 @@ CFLAGS += -DUSE_PORTAUDIO -I/opt/local/include # Well never mind, issue with Macports with 64bit libs ;-( leave the check in # until (if ever) Macports fixes the issue. -#GPS_HEADER := $(shell find /opt/local/include -maxdepth 1 -type f -name "gps.h") +#GPS_HEADER := $(shell find $(INSTALLDIR)/include -maxdepth 1 -type f -name "gps.h") #ifeq (${GPS_HEADER},) #GPS_OBJS := #else #CFLAGS += -DENABLE_GPSD -#LDLIBS += -L/opt/local/lib -lgps -lgpsd +#LDLIBS += -L$(INSTALLDIR)/lib -lgps -lgpsd #GPS_OBJS := dwgps.o dwgpsnmea.o dwgpsd.o #endif