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

Converted all libs from shared to static - it will allow closed-source apps to use LGPL-ed libsdl,

Browse Source 
and will solve some cross-referencing problems, like SDL_init called from static constructors.
This commit is contained in:
pelya
2010-05-06 18:46:42 +03:00
parent bd017bb179
commit 24dce42157
93 changed files with 165 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
alienblaster/project/jni/sdl/src/video/android/SDL_androidvideo.c
View File

@@ -103,7 +103,8 @@ static void * memBuffer1 = NULL;
static void * memBuffer2 = NULL;
static void * memBuffer = NULL;
// We have one Java thread drawing on GL surface, and another native C thread (typically main()) feeding it with video data
static SDL_Thread * mainThread = NULL;
extern SDL_Thread * SDL_mainThread;
SDL_Thread * SDL_mainThread = NULL;
// Some wicked multithreading
static SDL_mutex * WaitForNativeRender = NULL;
static SDL_cond * WaitForNativeRender1 = NULL;
@@ -411,15 +412,6 @@ int ANDROID_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors)
/* JNI-C++ wrapper stuff */
extern int main( int argc, char ** argv );
static int SDLCALL MainThreadWrapper(void * dummy)
{
int argc = 1;
char * argv[] = { "sdl" };
chdir(SDL_CURDIR_PATH);
return main( argc, argv );
};
#ifndef SDL_JAVA_PACKAGE_PATH
#error You have to define SDL_JAVA_PACKAGE_PATH to your package path with dots replaced with underscores, for example "com_example_SanAngeles"
#endif
@@ -427,12 +419,6 @@ static int SDLCALL MainThreadWrapper(void * dummy)
#define JAVA_EXPORT_NAME1(name,package) JAVA_EXPORT_NAME2(name,package)
#define JAVA_EXPORT_NAME(name) JAVA_EXPORT_NAME1(name,SDL_JAVA_PACKAGE_PATH)
extern void
JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz )
{
mainThread = SDL_CreateThread( MainThreadWrapper, NULL );
}
extern void
JAVA_EXPORT_NAME(DemoRenderer_nativeResize) ( JNIEnv* env, jobject thiz, jint w, jint h )
{
@@ -445,12 +431,12 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeResize) ( JNIEnv* env, jobject thiz, jint
extern void
JAVA_EXPORT_NAME(DemoRenderer_nativeDone) ( JNIEnv* env, jobject thiz )
{
if( mainThread )
if( SDL_mainThread )
{
__android_log_print(ANDROID_LOG_INFO, "libSDL", "quitting...");
SDL_PrivateQuit();
SDL_WaitThread(mainThread, NULL);
mainThread = NULL;
SDL_WaitThread(SDL_mainThread, NULL);
SDL_mainThread = NULL;
__android_log_print(ANDROID_LOG_INFO, "libSDL", "quit OK");
}
}