FIXED: Android 32bit build issues, expanded supported SDKs
This commit is contained in:
@@ -202,6 +202,8 @@ public:
|
||||
LOGI("initConsts: screenWidth=%d, calling getScreenHeight\n", _screenWidth);
|
||||
_screenHeight = env->CallIntMethod(instance, fHeight);
|
||||
LOGI("initConsts: screenHeight=%d, done\n", _screenHeight);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
void tick() {
|
||||
@@ -536,7 +538,7 @@ public:
|
||||
|
||||
static __inline bool isSquare(int n) {
|
||||
int L = n & 0xf;
|
||||
if ((1 << L) & 0x213 == 0) return false;
|
||||
if (((1 << L) & 0x213) == 0) return false;
|
||||
|
||||
int t = (int) sqrt((double) n) + 0.5;
|
||||
return t*t == n;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "OptionsFile.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <platform/log.h>
|
||||
|
||||
OptionsFile::OptionsFile() {
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
#else
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
#ifndef STANDALONE_SERVER
|
||||
|
||||
@@ -7,8 +7,7 @@
|
||||
//#include "main_android_java.h"
|
||||
#include "platform/input/Multitouch.h"
|
||||
#include <unistd.h>
|
||||
#include <sys/syscall.h>
|
||||
#define gettid() ((int)syscall(SYS_gettid))
|
||||
#include <pthread.h>
|
||||
|
||||
// Horrible, I know. / A
|
||||
#ifndef MAIN_CLASS
|
||||
@@ -145,7 +144,7 @@ Java_com_mojang_minecraftpe_GLRenderer_nativeOnSurfaceCreated(JNIEnv* env) {
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_mojang_minecraftpe_GLRenderer_nativeOnSurfaceChanged(JNIEnv* env, jclass cls, jint w, jint h) {
|
||||
LOGI("@nativeOnSurfaceChanged: %p\n", pthread_self());
|
||||
LOGI("@nativeOnSurfaceChanged: %lu\n", (unsigned long)pthread_self());
|
||||
|
||||
if (gApp) {
|
||||
gApp->setSize(w, h);
|
||||
|
||||
Reference in New Issue
Block a user