diff options
| -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 | ||||
| -rw-r--r-- | src/game.cpp | 6 | ||||
| -rw-r--r-- | src/util/string.h | 6 |
5 files changed, 15 insertions, 14 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 \ diff --git a/src/game.cpp b/src/game.cpp index 2c969b931..4518c1612 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2061,7 +2061,7 @@ bool Game::initGui(std::wstring *error_message) #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui) - g_touchscreengui->init(tsrc, porting::getDisplayDensity()); + g_touchscreengui->init(texture_src, porting::getDisplayDensity()); #endif @@ -2852,8 +2852,8 @@ void Game::updateCameraDirection(CameraOrientation *cam, #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui) { - camera_yaw = g_touchscreengui->getYaw(); - camera_pitch = g_touchscreengui->getPitch(); + cam->camera_yaw = g_touchscreengui->getYaw(); + cam->camera_pitch = g_touchscreengui->getPitch(); } else { #endif s32 dx = input->getMousePos().X - (driver->getScreenSize().Width / 2); diff --git a/src/util/string.h b/src/util/string.h index f4337062e..52ef8c164 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -212,11 +212,11 @@ inline std::string trim(const std::string &s) { size_t front = 0; - while (isspace(s[front])) + while (std::isspace(s[front])) ++front; size_t back = s.size(); - while (back > front && isspace(s[back-1])) + while (back > front && std::isspace(s[back-1])) --back; return s.substr(front, back - front); @@ -481,7 +481,7 @@ inline std::string unescape_string(std::string &s) inline bool is_number(const std::string &tocheck) { for (size_t i = 0; i < tocheck.size(); i++) - if (!isdigit(tocheck[i])) + if (!std::isdigit(tocheck[i])) return false; return !tocheck.empty(); |