diff --git a/compile.sh b/compile.sh index 86c72b5492952eaf118d4e0f067a9ff8ebf09429..8d9455eeccecec40ea1a703216f29a6e8e042832 100755 --- a/compile.sh +++ b/compile.sh @@ -96,7 +96,7 @@ ANDROID_PATH="`pwd`" if [ ! -z "$FETCH" ] then # 1/ libsflphone - TESTED_HASH=00bf4e25091e03ced364b626e64bd92df038ab82 + TESTED_HASH=c88b5559cfb36cca66b36d51166d02ae7c118d88 if [ ! -d "sflphone" ]; then echo "sflphone daemon source not found, cloning" git clone https://gerrit-sflphone.savoirfairelinux.com/sflphone @@ -170,6 +170,9 @@ EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CX EXTRA_CFLAGS="${EXTRA_CFLAGS} -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/include" CXXFLAGS="${CXXFLAGS} -I/home/alision/sflphone-android/sflphone-android/jni" +#Â Setup LDFLAGS +EXTRA_LDFLAGS="-l${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}/libgnustl_static.a" + # Make in // UNAMES=$(uname -s) MAKEFLAGS= @@ -217,7 +220,9 @@ else fi echo "EXTRA_CFLAGS= -g ${EXTRA_CFLAGS}" >> config.mak +echo "EXTRA_LDFLAGS= ${EXTRA_LDFLAGS}" >> config.mak export SFLPHONE_EXTRA_CFLAGS="${EXTRA_CFLAGS}" +export SFLPHONE_EXTRA_LDFLAGS="${EXTRA_LDFLAGS}" make install echo ${PWD} diff --git a/configure.sh b/configure.sh index 65118c636fb3a7f45c3f6d78f475d1c9d156a1fa..0585514a5ae63424b9417f9d5c1203be2b3e1bed 100755 --- a/configure.sh +++ b/configure.sh @@ -43,7 +43,7 @@ cd $SFLPHONE_SOURCEDIR/daemon CPPFLAGS="$CPPFLAGS" \ CFLAGS="$CFLAGS ${SFLPHONE_EXTRA_CFLAGS}" \ CXXFLAGS="$CFLAGS" \ -LDFLAGS="$LDFLAGS" \ +LDFLAGS="$LDFLAGS ${SFLPHONE_EXTRA_LDFLAGS}" \ CC="${CROSS_COMPILE}gcc --sysroot=${SYSROOT}" \ CXX="${CROSS_COMPILE}g++ --sysroot=${SYSROOT}" \ NM="${CROSS_COMPILE}nm" \