diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-04-01 10:32:59 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2013-04-01 10:32:59 +0000 |
| commit | 0dba9afa03302f67b20b718adbb690c9a087d4a4 (patch) | |
| tree | bc22b37ed739925c270f1a9758a634c1b678608b /src/native | |
| parent | 97cba28a43baddfd20d8335140f7173d8052f8ea (diff) | |
| download | jitsi-0dba9afa03302f67b20b718adbb690c9a087d4a4.zip jitsi-0dba9afa03302f67b20b718adbb690c9a087d4a4.tar.gz jitsi-0dba9afa03302f67b20b718adbb690c9a087d4a4.tar.bz2 | |
Fixes building natives using i386 debian.
Diffstat (limited to 'src/native')
| -rw-r--r-- | src/native/build.xml | 3 | ||||
| -rw-r--r-- | src/native/libjunbound/make-linux.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/native/build.xml b/src/native/build.xml index 308ceb2..6a3e3ad 100644 --- a/src/native/build.xml +++ b/src/native/build.xml @@ -438,6 +438,7 @@ <compilerarg value="-I/usr/include/dbus-1.0" /> <compilerarg value="-I/usr/lib/dbus-1.0/include" /> <compilerarg value="-I/usr/lib/x86_64-linux-gnu/dbus-1.0/include" /> + <compilerarg value="-I/usr/lib/i386-linux-gnu/dbus-1.0/include" /> <compilerarg value="-m32" if="cross_32" /> <compilerarg value="-m64" if="cross_64" /> <compilerarg value="-I${system.JAVA_HOME}/include" /> @@ -650,6 +651,8 @@ <compilerarg value="-I/usr/lib/gtk-2.0/include/" if="is.running.linux" /> <compilerarg value="-I/usr/lib/x86_64-linux-gnu/glib-2.0/include" if="is.running.linux" /> <compilerarg value="-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include" if="is.running.linux" /> + <compilerarg value="-I/usr/lib/i386-linux-gnu/glib-2.0/include" if="is.running.linux" /> + <compilerarg value="-I/usr/lib/i386-linux-gnu/gtk-2.0/include" if="is.running.linux" /> <compilerarg value="-m32" if="cross_32" unless="is.running.macos" /> <compilerarg value="-m64" if="cross_64" unless="is.running.macos" /> diff --git a/src/native/libjunbound/make-linux.sh b/src/native/libjunbound/make-linux.sh index 20bb0d8..6f8a36e 100644 --- a/src/native/libjunbound/make-linux.sh +++ b/src/native/libjunbound/make-linux.sh @@ -3,6 +3,7 @@ set -e out=`pwd`/build/linux prefix=$out/libs +export JAVA_HOME=/usr/lib/jvm/default-java/ mkdir -p $out mkdir -p $prefix @@ -38,6 +39,6 @@ make make install cd $out -gcc $out/../../src/net_java_sip_communicator_impl_dns_UnboundApi.cpp -fpic -shared -o libjunbound.so -I/usr/lib/jvm/java-6-openjdk/include -Wl,-Bstatic -L$prefix/lib -lunbound -lldns -I$prefix/include -Wl,-Bdynamic -lcrypto +gcc $out/../../src/net_java_sip_communicator_impl_dns_UnboundApi.cpp -fpic -shared -o libjunbound.so -I$JAVA_HOME/include -Wl,-Bstatic -L$prefix/lib -lunbound -lldns -I$prefix/include -Wl,-Bdynamic -lcrypto strip libjunbound.so |