diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-23 08:11:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-23 08:11:34 +0200 |
| commit | 582a97fc2ce1bc8b36811a9b1f23058ca7292067 (patch) | |
| tree | b06e19ac864e2208597bc3db86623a9f28ea2a32 /platform | |
| parent | 78d9936f8d63754a1480f99ad14a5eee642380a9 (diff) | |
| parent | 16de3835fa17418adb26e84843b40b39ab36ad01 (diff) | |
Merge pull request #10575 from henkz1/android_quit_error
fix UnsatisfiedLinkError when quitting on android
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotLib.java | 2 | ||||
| -rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotView.java | 2 | ||||
| -rw-r--r-- | platform/android/java_glue.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/java/src/org/godotengine/godot/GodotLib.java b/platform/android/java/src/org/godotengine/godot/GodotLib.java index 1ed04d9d27..98ac29d3ca 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotLib.java +++ b/platform/android/java/src/org/godotengine/godot/GodotLib.java @@ -48,7 +48,7 @@ public class GodotLib { public static native void initialize(Godot p_instance,boolean need_reload_hook,String[] p_cmdline,Object p_asset_manager); public static native void resize(int width, int height,boolean reload); public static native void newcontext(boolean p_32_bits); - public static native void quit(); + public static native void back(); public static native void step(); public static native void touch(int what,int pointer,int howmany, int[] arr); public static native void accelerometer(float x, float y, float z); diff --git a/platform/android/java/src/org/godotengine/godot/GodotView.java b/platform/android/java/src/org/godotengine/godot/GodotView.java index c6c68c36b0..752d9d501c 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotView.java +++ b/platform/android/java/src/org/godotengine/godot/GodotView.java @@ -264,7 +264,7 @@ public class GodotView extends GLSurfaceView implements InputDeviceListener { @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { - GodotLib.quit(); + GodotLib.back(); // press 'back' button should not terminate program //normal handle 'back' event in game logic return true; diff --git a/platform/android/java_glue.h b/platform/android/java_glue.h index bcb3304c3e..dd62cb2431 100644 --- a/platform/android/java_glue.h +++ b/platform/android/java_glue.h @@ -40,7 +40,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *en JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv *env, jobject obj, jint width, jint height, jboolean reload); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv *env, jobject obj, bool p_32_bits); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, jobject obj); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_quit(JNIEnv *env, jobject obj); +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jobject obj); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch(JNIEnv *env, jobject obj, jint ev, jint pointer, jint count, jintArray positions); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jobject obj, jint p_scancode, jint p_unicode_char, jboolean p_pressed); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jobject obj, jint p_device, jint p_button, jboolean p_pressed); |