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

and will solve some cross-referencing problems, like SDL_init called from static constructors.

alienblaster/project/jni/sdl/include/SDL.h

@@ -27,7 +27,9 @@
 #ifndef _SDL_H
 #define _SDL_H
 
+#ifndef ANDROID
 #include "SDL_main.h"
+#endif
 #include "SDL_stdinc.h"
 #include "SDL_audio.h"
 #include "SDL_cdrom.h"

alienblaster/project/jni/sdl/include/SDL_config_android.h

@@ -29,8 +29,7 @@
 
 #include <stdarg.h>
 #include <stdint.h>
-#include <string.h> // for memmove etc
-#include <strings.h> // for bcopy etc
+#include <sys/mman.h>
 
 #define SDL_AUDIO_DRIVER_ANDROID	1
 
@@ -52,19 +51,81 @@
 #define NO_SDL_GLEXT	1
 
 /* FireSlash found that SDL native memcpy crashes sometimes, these defines fix it (and they are faster) */
+#define HAVE_LIBC 1
+
+#define HAVE_ALLOCA_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#undef HAVE_ICONV_H
+#define HAVE_SIGNAL_H 1
+#undef HAVE_ALTIVEC_H
+
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_BCOPY 1
 #define HAVE_MEMSET 1
 #define HAVE_MEMCPY 1
 #define HAVE_MEMMOVE 1
-#define HAVE_BCOPY 1
 #define HAVE_MEMCMP 1
 #define HAVE_STRLEN 1
 #define HAVE_STRLCPY 1
 #define HAVE_STRLCAT 1
 #define HAVE_STRDUP 1
+#undef HAVE__STRREV
+#undef HAVE__STRUPR
+#undef HAVE__STRLWR
 #define HAVE_INDEX 1
 #define HAVE_RINDEX 1
 #define HAVE_STRCHR 1
 #define HAVE_STRRCHR 1
 #define HAVE_STRSTR 1
+#undef HAVE_ITOA
+#undef HAVE__LTOA
+#undef HAVE__UITOA
+#undef HAVE__ULTOA
+#define HAVE_STRTOL
+#define HAVE_STRTOUL
+#undef HAVE__I64TOA
+#undef HAVE__UI64TOA
+#define HAVE_STRTOLL 1
+#define HAVE_STRTOULL 1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#undef HAVE__STRICMP
+#define HAVE_STRCASECMP 1
+#undef HAVE__STRNICMP
+#define HAVE_STRNCASECMP 1
+#define HAVE_SSCANF 1
+#define HAVE_SNPRINTF 1
+#define HAVE_VSNPRINTF 1
+#undef HAVE_ICONV
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_CLOCK_GETTIME 1
+#define HAVE_GETPAGESIZE 1
+#define HAVE_MPROTECT 1
 
 #endif /* _SDL_config_minimal_h */

alienblaster/project/jni/sdl/include/SDL_main.h

@@ -103,4 +103,51 @@ extern DECLSPEC void SDLCALL SDL_InitQuickDraw(struct QDGlobals *the_qd);
 
 #endif /* Need to redefine main()? */
 
+#ifdef ANDROID
+
+#include <unistd.h>
+#include <jni.h>
+#include "SDL_thread.h"
+
+/* JNI-C wrapper stuff */
+
+#ifdef __cplusplus
+#define C_LINKAGE "C"
+#else
+#define C_LINKAGE
+#endif
+
+
+
+extern C_LINKAGE 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
+#define JAVA_EXPORT_NAME2(name,package) Java_##package##_##name
+#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 C_LINKAGE SDL_Thread * SDL_mainThread;
+
+extern C_LINKAGE void
+JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv*  env, jobject  thiz )
+{
+	SDL_mainThread = SDL_CreateThread( MainThreadWrapper, NULL );
+}
+
+#undef JAVA_EXPORT_NAME
+#undef JAVA_EXPORT_NAME1
+#undef JAVA_EXPORT_NAME2
+#undef C_LINKAGE
+
+#endif
+
 #endif /* _SDL_main_h */