From 5808921daf4c274ba15cb4a1688bb3cfc35045e1 Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Tue, 27 Oct 2009 08:25:15 +0000 Subject: [PATCH] Makes it easier to compile the native counterpart of the PortAudio support with different paths to portaudio and java dev files. --- src/native/portaudio/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/native/portaudio/Makefile b/src/native/portaudio/Makefile index 160f97b1c..116aa2d18 100644 --- a/src/native/portaudio/Makefile +++ b/src/native/portaudio/Makefile @@ -1,5 +1,5 @@ -PORTAUDIO_HOME=/home/damencho/dev/portaudio/portaudio -JAVA_HOME=/usr/lib/jvm/java-6-sun +PORTAUDIO_HOME?=/home/damencho/dev/portaudio/portaudio +JAVA_HOME?=/usr/lib/jvm/java-6-sun ARCH=$(shell uname -m | sed -e s/x86_64/-64/ -e s/i.86//) TARGET=../../../lib/native/linux$(ARCH)/libjportaudio.so @@ -10,7 +10,7 @@ CPPFLAGS=-DJNI_IMPLEMENTATION \ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \ -I$(PORTAUDIO_HOME)/include LDFLAGS=-shared -LIBS=-L$(PORTAUDIO_HOME)/lib/.libs -lasound -lm -lpthread -ljack -static -lportaudio +LIBS=-L$(PORTAUDIO_HOME)/lib/.libs -lasound -lm -lpthread -static -lportaudio $(TARGET): net_java_sip_communicator_impl_media_protocol_portaudio_PortAudio.c net_java_sip_communicator_impl_media_protocol_portaudio_PortAudio.h $(CC) $(CPPFLAGS) $< $(LDFLAGS) -o $@ $(LIBS)