From dd90b7ec96d3403409b802ea4e8de478fb190451 Mon Sep 17 00:00:00 2001 From: pelya Date: Sun, 26 Jun 2016 23:12:01 +0300 Subject: [PATCH] XSDL: fixed compilation with NDK r12 --- project/jni/application/xserver/AndroidBuild.sh | 6 +++--- project/jni/application/xserver/pulseaudio | 2 +- project/jni/application/xserver/xserver | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh index 7e4d2175c..1a8d7280a 100755 --- a/project/jni/application/xserver/AndroidBuild.sh +++ b/project/jni/application/xserver/AndroidBuild.sh @@ -4,13 +4,13 @@ CURDIR=`pwd` PACKAGE_NAME=`grep AppFullName AndroidAppSettings.cfg | sed 's/.*=//'` -[ -e pulseaudio/android-build.sh ] && { +if [ -e pulseaudio/android-build.sh ]; then [ -e pulseaudio/$1/install/bin/pulseaudio ] || { cd pulseaudio ./android-build.sh || exit 1 cd .. } || exit 1 -} || exit 1 +fi ../setEnvironment-$1.sh sh -c '\ $CC $CFLAGS -Werror=format -c main.c -o main-'"$1.o" || exit 1 @@ -72,7 +72,7 @@ xkb/.libs/libxkbstubs.a \ composite/.libs/libcomposite.a \ os/.libs/libos.a \ hw/kdrive/linux/.libs/liblinux.a \ --lpixman-1 -lXfont -lXau -lXdmcp -lfontenc -lts -lfreetype -landroid-shmem -lcrypto' \ +-lpixman-1 -lXfont -lXau -lXdmcp -lfontenc -lts -lfreetype -landroid-shmem -l:libcrypto.so.sdl.0.so' \ || exit 1 rm -rf $CURDIR/tmp-$1 diff --git a/project/jni/application/xserver/pulseaudio b/project/jni/application/xserver/pulseaudio index f04d54127..37ce31ed3 160000 --- a/project/jni/application/xserver/pulseaudio +++ b/project/jni/application/xserver/pulseaudio @@ -1 +1 @@ -Subproject commit f04d541277106e3310e4da6f84ebf4a8d2cb54ef +Subproject commit 37ce31ed32cf34fcb2f2fdbda40b6f24a9dd3424 diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver index ad7ad4873..6ea1ce707 160000 --- a/project/jni/application/xserver/xserver +++ b/project/jni/application/xserver/xserver @@ -1 +1 @@ -Subproject commit ad7ad4873dcf38f8581145e4578a011d0cda6483 +Subproject commit 6ea1ce707be8ae1b5260bf7c5e36db568c7431c9