From 7f4d0b725eafc334e301a38f06b7aa10e3550b84 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Sat, 9 Jun 2018 11:43:27 +0200 Subject: [PATCH] Remove obsolete content (since SDL 2.0.6) Fix link error on stderr. --- android/SDL_android_main.c | 79 ++------------------------------------ 1 file changed, 3 insertions(+), 76 deletions(-) diff --git a/android/SDL_android_main.c b/android/SDL_android_main.c index 7674206..0676ead 100644 --- a/android/SDL_android_main.c +++ b/android/SDL_android_main.c @@ -1,84 +1,11 @@ /* SDL_android_main.c, placed in the public domain by Sam Lantinga 3/13/14 */ -//#include "../../SDL_internal.h" -#ifdef __ANDROID__ - -/* Include the SDL main definition header */ -//#include "SDL_main.h" -#include - -/******************************************************************************* - Functions called by JNI -*******************************************************************************/ #include +#include -/* Called before SDL_main() to initialize JNI bindings in SDL library */ -extern void SDL_Android_Init(JNIEnv* env, jclass cls); - -/* This prototype is needed to prevent a warning about the missing prototype for global function below */ -JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject array); - -/* Start up the SDL app */ -JNIEXPORT int JNICALL Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject array) -{ - int i; - int argc; - int status; - int len; - char** argv; - - /* This interface could expand with ABI negotiation, callbacks, etc. */ - SDL_Android_Init(env, cls); - - SDL_SetMainReady(); - - /* Prepare the arguments. */ - - len = (*env)->GetArrayLength(env, array); - argv = SDL_stack_alloc(char*, 1 + len + 1); - argc = 0; - /* Use the name "app_process" so PHYSFS_platformCalcBaseDir() works. - https://bitbucket.org/MartinFelis/love-android-sdl2/issue/23/release-build-crash-on-start - */ - argv[argc++] = SDL_strdup("app_process"); - for (i = 0; i < len; ++i) { - const char* utf; - char* arg = NULL; - jstring string = (*env)->GetObjectArrayElement(env, array, i); - if (string) { - utf = (*env)->GetStringUTFChars(env, string, 0); - if (utf) { - arg = SDL_strdup(utf); - (*env)->ReleaseStringUTFChars(env, string, utf); - } - (*env)->DeleteLocalRef(env, string); - } - if (!arg) { - arg = SDL_strdup(""); - } - argv[argc++] = arg; - } - argv[argc] = NULL; - - - /* Run the application. */ - - status = SDL_main(argc, argv); - - /* Release the arguments. */ - - for (i = 0; i < argc; ++i) { - SDL_free(argv[i]); - } - SDL_stack_free(argv); - /* Do not issue an exit or the whole application will terminate instead of just the SDL thread */ - /* exit(status); */ - - return status; -} - -#endif /* __ANDROID__ */ +#undef stderr +FILE *stderr = &__sF[2]; /* vi: set ts=4 sw=4 expandtab: */