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

Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

Browse Source 
Conflicts:
	todo.txt
This commit is contained in:
pelya
2016-03-17 12:20:07 +02:00
parent f3a8d960e8 d0be1c1ce1
commit a33fd500a8
22 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
project/jni/application/bochs/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/*.so

1
project/jni/application/bochs/AndroidAppSettings.cfg Symbolic link
View File

@@ -0,0 +1 @@
bochs/android/bochs/AndroidAppSettings.cfg

1
project/jni/application/bochs/AndroidBuild.sh Symbolic link
View File

@@ -0,0 +1 @@
bochs/android/bochs/AndroidBuild.sh

1
project/jni/application/bochs/AndroidData Symbolic link
View File

@@ -0,0 +1 @@
bochs/android/bochs/AndroidData

1
project/jni/application/bochs/bochs Submodule

Submodule project/jni/application/bochs/bochs added at b8c3ab2779

1
project/jni/application/bochs/icon.png Symbolic link
View File

@@ -0,0 +1 @@
bochs/android/bochs/icon.png

2
project/jni/application/setEnvironment-armeabi-v7a-hard.sh
View File

@@ -18,8 +18,6 @@ NDK=`which ndk-build`
NDK=`dirname $NDK`
NDK=`readlink -f $NDK`
grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
#echo NDK $NDK
GCCPREFIX=arm-linux-androideabi
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9

2
project/jni/application/setEnvironment-armeabi-v7a.sh
View File

@@ -18,8 +18,6 @@ NDK=`which ndk-build`
NDK=`dirname $NDK`
NDK=`readlink -f $NDK`
grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
#echo NDK $NDK
GCCPREFIX=arm-linux-androideabi
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9

2
project/jni/application/setEnvironment-mips.sh
View File

@@ -18,8 +18,6 @@ NDK=`which ndk-build`
NDK=`dirname $NDK`
NDK=`readlink -f $NDK`
grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
#echo NDK $NDK
GCCPREFIX=mipsel-linux-android
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9

2
project/jni/application/setEnvironment-x86.sh
View File

@@ -18,8 +18,6 @@ NDK=`which ndk-build`
NDK=`dirname $NDK`
NDK=`readlink -f $NDK`
grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
#echo NDK $NDK
GCCPREFIX=i686-linux-android
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9

2
project/jni/application/setEnvironment.sh
View File

@@ -18,8 +18,6 @@ NDK=`which ndk-build`
NDK=`dirname $NDK`
NDK=`readlink -f $NDK`
grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
#echo NDK $NDK
GCCPREFIX=arm-linux-androideabi
[ -z "$NDK_TOOLCHAIN_VERSION" ] && NDK_TOOLCHAIN_VERSION=4.9