From 24d1669fe920a8112f5431b932f1eb178f74e562 Mon Sep 17 00:00:00 2001
From: Spencer Russell <spencer.f.russell@gmail.com>
Date: Sun, 22 Dec 2013 11:49:05 -0500
Subject: [PATCH] some build tweaks to get OSX working. needs testing on Linux

---
 .gitignore        |  1 +
 deps/src/Makefile | 12 ++++++++----
 src/PortAudio.jl  |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 84fcdbd..c375723 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.so
 *.o
 deps/usr
+deps/deps.jl
diff --git a/deps/src/Makefile b/deps/src/Makefile
index 246a98e..7c68484 100644
--- a/deps/src/Makefile
+++ b/deps/src/Makefile
@@ -16,7 +16,9 @@ endif
 #INC =-I"$(JULIA_INC)"
 FLAGS =-Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fPIC
 CFLAGS =-g
-LIBS =-lportaudio -lrt
+LIBS =-lportaudio
+LINUX_LIBS =-lrt
+LINUX_LDFLAGS =-rdynamic
 
 OBJS = shim.o
 
@@ -26,22 +28,24 @@ ifeq ($(OS), MINGW32_NT-6.1)
   OS=WINNT
 endif
 
-# file extensions
+# file extensions and platform-specific libs
 ifeq ($(OS), WINNT)
   SHLIB_EXT = dll
 else ifeq ($(OS), Darwin)
   SHLIB_EXT = dylib
 else
+  LIBS += $(LINUX_LIBS)
+  LDFLAGS += $(LINUX_LDFLAGS)
   SHLIB_EXT = so
 endif
 
 default: libportaudio_shim.$(SHLIB_EXT)
 
-%.o: %.c
+%.o: %.c Makefile
 	$(CC) $< -fPIC -c -o $@ $(INC) $(CFLAGS) $(FLAGS)
 
 libportaudio_shim.$(SHLIB_EXT): $(OBJS)
-	$(CC) $(OBJS) -rdynamic -shared -o $@ $(LDFLAGS) $(LIBS)
+	$(CC) $(OBJS) -shared -o $@ $(LDFLAGS) $(LIBS)
 
 clean:
 	rm -f *.o *.$(SHLIB_EXT)
diff --git a/src/PortAudio.jl b/src/PortAudio.jl
index 47e9dcc..6dd64a4 100644
--- a/src/PortAudio.jl
+++ b/src/PortAudio.jl
@@ -76,7 +76,7 @@ function audio_task(jl_filedesc)
         # have processed our last frame of data). At some point we should do
         # something with the data we get from the callback
         wait(jl_rawfd, readable=true)
-        ccall((:read, ""), Clong, (Cint, Ptr{Void}, Culong), jl_filedesc, desc_bytes, 1)
+        ccall(:read, Clong, (Cint, Ptr{Void}, Culong), jl_filedesc, desc_bytes, 1)
     end
 end