diff --git a/.gitignore b/.gitignore index eb5f126..80b613e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ *.swp *.so *.o -deps/usr deps/deps.jl *.wav *.flac diff --git a/deps/src/Makefile b/deps/src/Makefile index 1dafef4..4d6602d 100644 --- a/deps/src/Makefile +++ b/deps/src/Makefile @@ -23,6 +23,7 @@ LINUX_LDFLAGS =-rdynamic # portaudio and libsndfile DARWIN_LDFLAGS =-L../../../Homebrew/deps/usr/lib DARWIN_INC =-I../../../Homebrew/deps/usr/include +TARGETDIR=../usr/lib OBJS = shim.o @@ -46,13 +47,17 @@ else INC += $(LINUX_INC) endif -default: libportaudio_shim.$(SHLIB_EXT) +TARGET=$(TARGETDIR)/libportaudio_shim.$(SHLIB_EXT) + +default: $(TARGET) %.o: %.c Makefile $(CC) $< -fPIC -c -o $@ $(INC) $(CFLAGS) $(FLAGS) -libportaudio_shim.$(SHLIB_EXT): $(OBJS) +$(TARGET): $(OBJS) Makefile + mkdir -p $(TARGETDIR) $(CC) $(OBJS) -shared -o $@ $(LDFLAGS) $(LIBS) clean: - rm -f *.o *.$(SHLIB_EXT) + rm -f *.o + rm -f $(TARGET) diff --git a/deps/usr/lib/libportaudio_shim.dylib b/deps/usr/lib/libportaudio_shim.dylib new file mode 100755 index 0000000..46ae60e Binary files /dev/null and b/deps/usr/lib/libportaudio_shim.dylib differ