diff --git a/deps/build.jl b/deps/build.jl index dfedbbc..0c6ba89 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -17,7 +17,7 @@ provides(AptGet, {"libsndfile1-dev" => libsndfile}) end using Homebrew provides(Homebrew.HB, {"portaudio" => libportaudio}) - provides(Homebrew.HB, {"sndfile" => libsndfile}) + provides(Homebrew.HB, {"libsndfile" => libsndfile}) end @BinDeps.install [:libportaudio => :libportaudio, diff --git a/deps/src/Makefile b/deps/src/Makefile index cf825b9..1dafef4 100644 --- a/deps/src/Makefile +++ b/deps/src/Makefile @@ -19,6 +19,10 @@ CFLAGS =-g LIBS =-L/usr/local/lib -lportaudio LINUX_LIBS =-lrt 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 @@ -33,10 +37,13 @@ ifeq ($(OS), WINNT) SHLIB_EXT = dll else ifeq ($(OS), Darwin) SHLIB_EXT = dylib + INC += $(DARWIN_INC) + LDFLAGS += $(DARWIN_LDFLAGS) else LIBS += $(LINUX_LIBS) LDFLAGS += $(LINUX_LDFLAGS) SHLIB_EXT = so + INC += $(LINUX_INC) endif default: libportaudio_shim.$(SHLIB_EXT)