activate org.kwaak3.ext according to original MR

This commit is contained in:
David Black 2013-06-12 10:27:18 +01:00
parent 0ec8392d3c
commit dcae81f7f4
2 changed files with 5 additions and 5 deletions

View file

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

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/mkjni.sh 2012-12-13 13:16:34.319760324 +1100
@@ -0,0 +1,88 @@
+#!/bin/sh -e
+#!/bin/bash -e
+
+NDK="$ANDROID_NDK"
+
@ -277,14 +277,14 @@ index b65a717..02b500f 100644
+ ANDROID_CFLAGS="$ANDROID_CFLAGS -ffunction-sections"
+ fi
+
+ cd ioquake3
+ pushd ioquake3
+
+ # XXX: ioquake3 assumes, that NOKIA="OpenGL ES"
+ CC="$CC --sysroot=$SYSROOT" ANDROID_NDK_DIR="$NDK" LDFLAGS="$LDFLAGS" \
+ 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
+
+ cd ..
+ popd
+}
+
+# build ARM