diff options
| author | KodexKy <kodexky@gmail.com> | 2014-11-03 16:55:37 -0430 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2014-11-25 13:28:51 +1000 |
| commit | 5413ed11955a5b8a09625b2df1c28fb18c99c296 (patch) | |
| tree | 98078fd7cf6d99268ec9148d7e2a69f582808dbd /build | |
| parent | 9878e8de4fdf232ebb77b396766c339786c01218 (diff) | |
| download | minetest-5413ed11955a5b8a09625b2df1c28fb18c99c296.tar.gz minetest-5413ed11955a5b8a09625b2df1c28fb18c99c296.tar.bz2 minetest-5413ed11955a5b8a09625b2df1c28fb18c99c296.zip | |
Fixes for Android build errors. Enable sensor landscape rotation.
Fix typo in Android Makefile ndk path.
Fix touchscreen parts of game.cpp to work after Zeno's refactor.
Fix isdigit and isspace overload conflict with Android Irrlicht in string.h
Enable sensor landscape rotation in Android Manifiest.
Add mapgen v5 to Android build.
Fix Makefile not checking leveldb.
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/AndroidManifest.xml.template | 2 | ||||
| -rw-r--r-- | build/android/Makefile | 14 | ||||
| -rw-r--r-- | build/android/jni/Android.mk | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/build/android/AndroidManifest.xml.template b/build/android/AndroidManifest.xml.template index dcffa35f6..0f2061897 100644 --- a/build/android/AndroidManifest.xml.template +++ b/build/android/AndroidManifest.xml.template @@ -15,7 +15,7 @@ android:label="Minetest" android:launchMode="singleTask" android:configChanges="orientation|keyboardHidden" - android:screenOrientation="landscape" + android:screenOrientation="sensorLandscape" android:clearTaskOnLaunch="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/build/android/Makefile b/build/android/Makefile index ba6ab3b74..12e4872de 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -125,6 +125,11 @@ FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android -include $(PATHCFGFILE) +#use interim target variable to switch leveldb on or off +ifeq ($(HAVE_LEVELDB),1) + LEVELDB_TARGET = $(LEVELDB_LIB) +endif + .PHONY : debug release reconfig delconfig \ leveldb_download clean_leveldb leveldb\ irrlicht_download clean_irrlicht irrlicht \ @@ -140,11 +145,6 @@ FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android $(OPENSSL_TIMESTAMP) curl_binary \ $(ROOT)/jni/src/android_version.h -#use interim target variable to switch leveldb on or off -ifeq ($(HAVE_LEVELDB),1) - LEVELDB_TARGET = $(LEVELDB_LIB) -endif - debug : $(PATHCFGFILE) export NDEBUG=; \ export BUILD_TYPE=debug; \ @@ -172,9 +172,9 @@ $(PATHCFGFILE) : exit 1; \ fi; \ echo "ANDROID_NDK = $$ANDROID_NDK" > ${PATHCFGFILE}; \ - echo "NDK_MODULE_PATH = $$ANDROID_NDK/tools" >> ${PATHCFGFILE}; \ + echo "NDK_MODULE_PATH = $$ANDROID_NDK/toolchains" >> ${PATHCFGFILE}; \ echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\ - echo "+ Note: NDK_MODULE_PATH is set to $$ANDROID_NDK/tools"; \ + echo "+ Note: NDK_MODULE_PATH is set to $$ANDROID_NDK/toolchains"; \ echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\ echo "Please specify path of ANDROID SDK"; \ echo "e.g. /home/user/adt-bundle-linux-x86_64-20131030/sdk/"; \ diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index d23630c6b..6c6ba6388 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -159,6 +159,7 @@ LOCAL_SRC_FILES := \ jni/src/mapblock_mesh.cpp \ jni/src/mapgen.cpp \ jni/src/mapgen_singlenode.cpp \ + jni/src/mapgen_v5.cpp \ jni/src/mapgen_v6.cpp \ jni/src/mapgen_v7.cpp \ jni/src/mapnode.cpp \ |