From 0d89ddb5322b6921eba2f9b1c91e40d5e1c20eb3 Mon Sep 17 00:00:00 2001 From: Spencer Russell Date: Fri, 13 Dec 2013 00:06:48 -0500 Subject: [PATCH] adds build, adds the play_sin ccalls to portaudio.jl for testing --- deps/build.jl | 13 +++++++++++++ deps/src/Makefile | 4 ++-- src/portaudio.jl | 4 ++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 deps/build.jl diff --git a/deps/build.jl b/deps/build.jl new file mode 100644 index 0000000..d90c9f4 --- /dev/null +++ b/deps/build.jl @@ -0,0 +1,13 @@ +using BinDeps + +ENV["JULIA_ROOT"] = abspath(JULIA_HOME, "../../") + +cd(joinpath(Pkg.dir(), "PortAudio", "deps", "src") ) +run(`make`) +if (!ispath("../usr")) + run(`mkdir ../usr`) +end +if (!ispath("../usr/lib")) + run(`mkdir ../usr/lib`) +end +run(`mv libportaudio_shim.$(BinDeps.shlib_ext) ../usr/lib`) diff --git a/deps/src/Makefile b/deps/src/Makefile index a95fe24..3a26862 100644 --- a/deps/src/Makefile +++ b/deps/src/Makefile @@ -37,12 +37,12 @@ else SHLIB_EXT = so endif -default: portaudio_shim.$(SHLIB_EXT) +default: libportaudio_shim.$(SHLIB_EXT) %.o: %.c $(CC) $< -fPIC -c -o $@ $(INC) $(CFLAGS) $(FLAGS) -portaudio_shim.$(SHLIB_EXT): $(OBJS) +libportaudio_shim.$(SHLIB_EXT): $(OBJS) $(CC) $(OBJS) -rdynamic -shared -o $@ $(LDFLAGS) $(LIBS) clean: diff --git a/src/portaudio.jl b/src/portaudio.jl index cb14bee..1912998 100644 --- a/src/portaudio.jl +++ b/src/portaudio.jl @@ -28,9 +28,13 @@ function deinit() end function play_sin() + err = ccall((:play_sin, "libportaudio_shim"), PaError, ()) + handle_status(err) end function stop_sin() + err = ccall((:stop_sin, "libportaudio_shim"), PaError, ()) + handle_status(err) end end # module PortAudio