fix org.kwaak3.ext patch to work with dash

This commit is contained in:
David Black 2013-02-23 11:29:23 +00:00
parent 0a8c7cc0c5
commit ee36e36fd4
2 changed files with 6 additions and 6 deletions

View file

@ -15,12 +15,12 @@ do not work in this version, so you need hardware keys to play.
Repo Type:git-svn Repo Type:git-svn
Repo:http://kwaak3.googlecode.com/svn/trunk/ Repo:http://kwaak3.googlecode.com/svn/trunk/
Build Version:1.0,1,!bash script 37,subdir=kwaak/project,buildjni=yes,target=android-10,novcheck=yes,patch=common.patch,prebuild=\ Build Version:1.0,1,37,subdir=kwaak/project,target=android-10,novcheck=yes,\
cd ../.. && chmod +x mkjni.sh && ANDROID_NDK=$$NDK$$ ./mkjni.sh && cd kwaak/project patch=common.patch,prebuild=\
cd ../.. && chmod +x mkjni.sh && ANDROID_NDK=$$NDK$$ ./mkjni.sh && cd kwaak/project,buildjni=yes
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:None Update Check Mode:None
Current Version:1.0 Current Version:1.0
Current Version Code:1 Current Version Code:1

View file

@ -259,7 +259,7 @@ index b65a717..02b500f 100644
--- org.kwaak3.ext.old/mkjni.sh 1970-01-01 10:00:00.000000000 +1000 --- org.kwaak3.ext.old/mkjni.sh 1970-01-01 10:00:00.000000000 +1000
+++ org.kwaak3.ext/mkjni.sh 2012-12-13 13:16:34.319760324 +1100 +++ org.kwaak3.ext/mkjni.sh 2012-12-13 13:16:34.319760324 +1100
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
+#!/bin/bash -e +#!/bin/sh -e
+ +
+NDK="$ANDROID_NDK" +NDK="$ANDROID_NDK"
+ +
@ -277,14 +277,14 @@ index b65a717..02b500f 100644
+ ANDROID_CFLAGS="$ANDROID_CFLAGS -ffunction-sections" + ANDROID_CFLAGS="$ANDROID_CFLAGS -ffunction-sections"
+ fi + fi
+ +
+ pushd ioquake3 + cd ioquake3
+ +
+ # XXX: ioquake3 assumes, that NOKIA="OpenGL ES" + # XXX: ioquake3 assumes, that NOKIA="OpenGL ES"
+ CC="$CC --sysroot=$SYSROOT" ANDROID_NDK_DIR="$NDK" LDFLAGS="$LDFLAGS" \ + CC="$CC --sysroot=$SYSROOT" ANDROID_NDK_DIR="$NDK" LDFLAGS="$LDFLAGS" \
+ CFLAGS="$ANDROID_CFLAGS -fno-short-enums -fpic -fstack-protector -DANDROID -DNOKIA" \ + CFLAGS="$ANDROID_CFLAGS -fno-short-enums -fpic -fstack-protector -DANDROID -DNOKIA" \
+ COMPILE_ARCH=$(uname -m | sed -e s/i.86/i386/) ARCH=$ARCH make -e $MODE + COMPILE_ARCH=$(uname -m | sed -e s/i.86/i386/) ARCH=$ARCH make -e $MODE
+ +
+ popd + cd ..
+} +}
+ +
+# build ARM +# build ARM