Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
KodexKy 2014-11-03 16:55:37 -04:30 committed by Craig Robbins
parent 9878e8de4f
commit 5413ed1195
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/android/AndroidManifest.xml.template
View File

@ -15,7 +15,7 @@
android:label="Minetest" android:label="Minetest"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|keyboardHidden" android:configChanges="orientation|keyboardHidden"
android:screenOrientation="landscape" android:screenOrientation="sensorLandscape"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

14
build/android/Makefile
View File

@ -125,6 +125,11 @@ FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android
-include $(PATHCFGFILE) -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 \ .PHONY : debug release reconfig delconfig \
leveldb_download clean_leveldb leveldb\ leveldb_download clean_leveldb leveldb\
irrlicht_download clean_irrlicht irrlicht \ irrlicht_download clean_irrlicht irrlicht \
@ -140,11 +145,6 @@ FREETYPE_URL_GIT = https://github.com/cdave1/freetype2-android
$(OPENSSL_TIMESTAMP) curl_binary \ $(OPENSSL_TIMESTAMP) curl_binary \
$(ROOT)/jni/src/android_version.h $(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) debug : $(PATHCFGFILE)
export NDEBUG=; \ export NDEBUG=; \
export BUILD_TYPE=debug; \ export BUILD_TYPE=debug; \
@ -172,9 +172,9 @@ $(PATHCFGFILE) :
exit 1; \ exit 1; \
fi; \ fi; \
echo "ANDROID_NDK = $$ANDROID_NDK" > ${PATHCFGFILE}; \ echo "ANDROID_NDK = $$ANDROID_NDK" > ${PATHCFGFILE}; \
echo "NDK_MODULE_PATH = $$ANDROID_NDK/tools" >> ${PATHCFGFILE}; \ echo "NDK_MODULE_PATH = $$ANDROID_NDK/toolchains" >> ${PATHCFGFILE}; \
echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\ 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 "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";\
echo "Please specify path of ANDROID SDK"; \ echo "Please specify path of ANDROID SDK"; \
echo "e.g. /home/user/adt-bundle-linux-x86_64-20131030/sdk/"; \ echo "e.g. /home/user/adt-bundle-linux-x86_64-20131030/sdk/"; \

1
build/android/jni/Android.mk
View File

@ -159,6 +159,7 @@ LOCAL_SRC_FILES := \
jni/src/mapblock_mesh.cpp \ jni/src/mapblock_mesh.cpp \
jni/src/mapgen.cpp \ jni/src/mapgen.cpp \
jni/src/mapgen_singlenode.cpp \ jni/src/mapgen_singlenode.cpp \
jni/src/mapgen_v5.cpp \
jni/src/mapgen_v6.cpp \ jni/src/mapgen_v6.cpp \
jni/src/mapgen_v7.cpp \ jni/src/mapgen_v7.cpp \
jni/src/mapnode.cpp \ jni/src/mapnode.cpp \

6
src/game.cpp
View File

@ -2061,7 +2061,7 @@ bool Game::initGui(std::wstring *error_message)
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
if (g_touchscreengui) if (g_touchscreengui)
g_touchscreengui->init(tsrc, porting::getDisplayDensity()); g_touchscreengui->init(texture_src, porting::getDisplayDensity());
#endif #endif
@ -2852,8 +2852,8 @@ void Game::updateCameraDirection(CameraOrientation *cam,
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
if (g_touchscreengui) { if (g_touchscreengui) {
camera_yaw = g_touchscreengui->getYaw(); cam->camera_yaw = g_touchscreengui->getYaw();
camera_pitch = g_touchscreengui->getPitch(); cam->camera_pitch = g_touchscreengui->getPitch();
} else { } else {
#endif #endif
s32 dx = input->getMousePos().X - (driver->getScreenSize().Width / 2); s32 dx = input->getMousePos().X - (driver->getScreenSize().Width / 2);

6
src/util/string.h
View File

@ -212,11 +212,11 @@ inline std::string trim(const std::string &s)
{ {
size_t front = 0; size_t front = 0;
while (isspace(s[front])) while (std::isspace(s[front]))
++front; ++front;
size_t back = s.size(); size_t back = s.size();
while (back > front && isspace(s[back-1])) while (back > front && std::isspace(s[back-1]))
--back; --back;
return s.substr(front, back - front); 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) inline bool is_number(const std::string &tocheck)
{ {
for (size_t i = 0; i < tocheck.size(); i++) for (size_t i = 0; i < tocheck.size(); i++)
if (!isdigit(tocheck[i])) if (!std::isdigit(tocheck[i]))
return false; return false;
return !tocheck.empty(); return !tocheck.empty();