diff options
| author | jonyrock | 2014-05-01 20:15:28 +0400 |
|---|---|---|
| committer | jonyrock | 2014-05-01 20:15:28 +0400 |
| commit | 209eaf6fa06eba8a05e5222bdab418cd0f20c91c (patch) | |
| tree | 94eac56be6ad254a7c09e13d5e14bd843626232c /platform/android/java_glue.h | |
| parent | 34aea718b11e105d30c938ad34e474b1bd8b5d63 (diff) | |
| parent | 6572d5128856b2ec55a2c417c92e584899f4906f (diff) | |
| download | godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.tar.gz godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.tar.zst godot-209eaf6fa06eba8a05e5222bdab418cd0f20c91c.zip | |
Merge remote-tracking branch 'upstream/master' into pair_symbols_tool
Diffstat (limited to 'platform/android/java_glue.h')
| -rw-r--r-- | platform/android/java_glue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/java_glue.h b/platform/android/java_glue.h index a51912272..6dc89418b 100644 --- a/platform/android/java_glue.h +++ b/platform/android/java_glue.h @@ -36,7 +36,7 @@ extern "C" { - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook); + JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline); JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_resize(JNIEnv * env, jobject obj, jint width, jint height, jboolean reload); JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_newcontext(JNIEnv * env, jobject obj); JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_step(JNIEnv * env, jobject obj); |