miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XSDL: fixed compilation with NDK r12

Browse Source
This commit is contained in:
pelya
2016-06-26 23:12:01 +03:00
parent 29f07b59a5
commit dd90b7ec96
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/application/xserver/AndroidBuild.sh
View File

@@ -4,13 +4,13 @@ CURDIR=`pwd`
PACKAGE_NAME=`grep AppFullName AndroidAppSettings.cfg | sed 's/.*=//'` 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 ] || { [ -e pulseaudio/$1/install/bin/pulseaudio ] || {
cd pulseaudio cd pulseaudio
./android-build.sh || exit 1 ./android-build.sh || exit 1
cd .. cd ..
} || exit 1 } || exit 1
} || exit 1 fi
../setEnvironment-$1.sh sh -c '\ ../setEnvironment-$1.sh sh -c '\
$CC $CFLAGS -Werror=format -c main.c -o main-'"$1.o" || exit 1 $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 \ composite/.libs/libcomposite.a \
os/.libs/libos.a \ os/.libs/libos.a \
hw/kdrive/linux/.libs/liblinux.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 || exit 1
rm -rf $CURDIR/tmp-$1 rm -rf $CURDIR/tmp-$1

2
project/jni/application/xserver/pulseaudio

Submodule project/jni/application/xserver/pulseaudio updated: f04d541277...37ce31ed32

2
project/jni/application/xserver/xserver

Submodule project/jni/application/xserver/xserver updated: ad7ad4873d...6ea1ce707b