fixes to work with new support in Homebrew.jl for libsndfile and portaudio

This commit is contained in:
Spencer Russell 2014-07-27 12:57:18 -04:00
parent 450a9e9184
commit 3d1def96ec
2 changed files with 8 additions and 1 deletions

2
deps/build.jl vendored
View file

@ -17,7 +17,7 @@ provides(AptGet, {"libsndfile1-dev" => libsndfile})
end end
using Homebrew using Homebrew
provides(Homebrew.HB, {"portaudio" => libportaudio}) provides(Homebrew.HB, {"portaudio" => libportaudio})
provides(Homebrew.HB, {"sndfile" => libsndfile}) provides(Homebrew.HB, {"libsndfile" => libsndfile})
end end
@BinDeps.install [:libportaudio => :libportaudio, @BinDeps.install [:libportaudio => :libportaudio,

7
deps/src/Makefile vendored
View file

@ -19,6 +19,10 @@ CFLAGS =-g
LIBS =-L/usr/local/lib -lportaudio LIBS =-L/usr/local/lib -lportaudio
LINUX_LIBS =-lrt LINUX_LIBS =-lrt
LINUX_LDFLAGS =-rdynamic LINUX_LDFLAGS =-rdynamic
# add the Homebrew.jl tree to the include dirs in case we used it for
# portaudio and libsndfile
DARWIN_LDFLAGS =-L../../../Homebrew/deps/usr/lib
DARWIN_INC =-I../../../Homebrew/deps/usr/include
OBJS = shim.o OBJS = shim.o
@ -33,10 +37,13 @@ ifeq ($(OS), WINNT)
SHLIB_EXT = dll SHLIB_EXT = dll
else ifeq ($(OS), Darwin) else ifeq ($(OS), Darwin)
SHLIB_EXT = dylib SHLIB_EXT = dylib
INC += $(DARWIN_INC)
LDFLAGS += $(DARWIN_LDFLAGS)
else else
LIBS += $(LINUX_LIBS) LIBS += $(LINUX_LIBS)
LDFLAGS += $(LINUX_LDFLAGS) LDFLAGS += $(LINUX_LDFLAGS)
SHLIB_EXT = so SHLIB_EXT = so
INC += $(LINUX_INC)
endif endif
default: libportaudio_shim.$(SHLIB_EXT) default: libportaudio_shim.$(SHLIB_EXT)