miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sdl_android' of github.com:pelya/commandergenius into android

Browse Source
This commit is contained in:
pelya
2011-08-29 18:27:57 +03:00
parent e273541156 972d6c3039
commit 0dd7480538
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/jni/sdl-1.2/include/SDL_main.h
View File

@@ -24,6 +24,9 @@
#define _SDL_main_h #define _SDL_main_h
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#ifdef RELEASE_BUILD
#include <jni.h>
#endif
/** @file SDL_main.h /** @file SDL_main.h
* Redefine main() on Win32 and MacOS so that it is called by winmain.c * Redefine main() on Win32 and MacOS so that it is called by winmain.c
@@ -54,8 +57,11 @@
#define main SDL_main #define main SDL_main
/** The prototype for the application's main() function */ /** The prototype for the application's main() function */
#ifdef RELEASE_BUILD
extern C_LINKAGE int SDL_main(int argc, char *argv[], JNIEnv* env, jobject thiz);
#else
extern C_LINKAGE int SDL_main(int argc, char *argv[]); extern C_LINKAGE int SDL_main(int argc, char *argv[]);
#endif
/** @name From the SDL library code -- needed for registering the app on Win32 */ /** @name From the SDL library code -- needed for registering the app on Win32 */
/*@{*/ /*@{*/

22
project/jni/sdl_main/sdl_main.c
View File

@@ -28,6 +28,11 @@
static int argc = 0; static int argc = 0;
static char ** argv = NULL; static char ** argv = NULL;
#ifdef RELEASE_BUILD
static JNIEnv* static_env;
static jobject static_thiz;
#endif
#if SDL_VERSION_ATLEAST(1,3,0) #if SDL_VERSION_ATLEAST(1,3,0)
#else #else
extern void SDL_ANDROID_MultiThreadedVideoLoopInit(); extern void SDL_ANDROID_MultiThreadedVideoLoopInit();
@@ -35,7 +40,11 @@ extern void SDL_ANDROID_MultiThreadedVideoLoop();
static int threadedMain(void * unused) static int threadedMain(void * unused)
{ {
#ifdef RELEASE_BUILD
SDL_main( argc, argv, static_env, static_thiz );
#else
SDL_main( argc, argv ); SDL_main( argc, argv );
#endif
__android_log_print(ANDROID_LOG_INFO, "libSDL", "Application closed, calling exit(0)"); __android_log_print(ANDROID_LOG_INFO, "libSDL", "Application closed, calling exit(0)");
exit(0); exit(0);
} }
@@ -49,6 +58,11 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring
const jbyte *jstr; const jbyte *jstr;
const char * str = "sdl"; const char * str = "sdl";
#ifdef RELEASE_BUILD
static_env = env;
static_thiz = thiz;
#endif
strcpy(curdir, "/sdcard/app-data/"); strcpy(curdir, "/sdcard/app-data/");
strcat(curdir, SDL_CURDIR_PATH); strcat(curdir, SDL_CURDIR_PATH);
@@ -102,10 +116,18 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring
__android_log_print(ANDROID_LOG_INFO, "libSDL", "param %d = \"%s\"", i, argv[i]); __android_log_print(ANDROID_LOG_INFO, "libSDL", "param %d = \"%s\"", i, argv[i]);
#if SDL_VERSION_ATLEAST(1,3,0) #if SDL_VERSION_ATLEAST(1,3,0)
#ifdef RELEASE_BUILD
SDL_main( argc, argv, env, thiz );
#else
SDL_main( argc, argv ); SDL_main( argc, argv );
#endif
#else #else
if( ! multiThreadedVideo ) if( ! multiThreadedVideo )
#ifdef RELEASE_BUILD
SDL_main( argc, argv, env, thiz );
#else
SDL_main( argc, argv ); SDL_main( argc, argv );
#endif
else else
{ {
SDL_ANDROID_MultiThreadedVideoLoopInit(); SDL_ANDROID_MultiThreadedVideoLoopInit();