some build tweaks to get OSX working. needs testing on Linux
This commit is contained in:
parent
a284fde53f
commit
24d1669fe9
3 changed files with 10 additions and 5 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -2,3 +2,4 @@
|
|||
*.so
|
||||
*.o
|
||||
deps/usr
|
||||
deps/deps.jl
|
||||
|
|
12
deps/src/Makefile
vendored
12
deps/src/Makefile
vendored
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue