PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
mistermatt2u 2015-12-16 00:06:22 -05:00
parent 3839ccf333
commit f71eab3ddc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.macosx
View File

@ -142,19 +142,19 @@ endif
# Use PortAudio Library # Use PortAudio Library
# Force static linking of portaudio if the static library is available. # 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}]) #$(info $$PA_LIB_STATIC is [${PA_LIB_STATIC}])
ifeq (${PA_LIB_STATIC},) ifeq (${PA_LIB_STATIC},)
LDLIBS += -L/usr/local/lib -lportaudio LDLIBS += -L/opt/local/lib -lportaudio
else else
LDLIBS += /usr/local/lib/libportaudio.a LDLIBS += /opt/local/lib/libportaudio.a
endif endif
# Include libraries portaudio requires. # Include libraries portaudio requires.
LDLIBS += -framework CoreAudio -framework AudioUnit -framework AudioToolbox LDLIBS += -framework CoreAudio -framework AudioUnit -framework AudioToolbox
LDLIBS += -framework Foundation -framework CoreServices 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. # Uncomment following lines to enable GPS interface & tracker function.
# Not available for MacOSX. # Not available for MacOSX.