--- a/Makefile.android	Tue Jul 27 11:35:06 2010 +0200
+++ b/Makefile.android	Tue Jul 27 15:23:09 2010 +0200
@@ -33,8 +33,8 @@
 	src/joystick/dummy/*.c \
 	src/haptic/dummy/*.c \
 	src/atomic/dummy/*.c \
-	src/thread/generic/*.c \
-	src/timer/dummy/*.c \
+	src/thread/pthread/*.c \
+	src/timer/unix/*.c \
 	src/loadso/dummy/*.c \
 
 OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')

--- a/include/SDL_config_android.h	Tue Jul 27 11:35:06 2010 +0200
+++ b/include/SDL_config_android.h	Tue Jul 27 15:23:09 2010 +0200
@@ -42,6 +42,74 @@
 typedef unsigned int uint32_t;
 */
 
+
+#define HAVE_ALLOCA_H		1
+#define HAVE_SYS_TYPES_H	1
+#define HAVE_STDIO_H	1
+#define STDC_HEADERS	1
+#define HAVE_STRING_H	1
+#define HAVE_INTTYPES_H	1
+#define HAVE_STDINT_H	1
+#define HAVE_CTYPE_H	1
+#define HAVE_MATH_H	1
+#define HAVE_SIGNAL_H	1
+
+/* C library functions */
+#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_SETENV	1
+#define HAVE_PUTENV	1
+#define HAVE_SETENV	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_MEMCMP	1
+#define HAVE_STRLEN	1
+#define HAVE_STRLCPY	1
+#define HAVE_STRLCAT	1
+#define HAVE_STRDUP	1
+#define HAVE_STRCHR	1
+#define HAVE_STRRCHR	1
+#define HAVE_STRSTR	1
+#define HAVE_STRTOL	1
+#define HAVE_STRTOUL	1
+#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
+#define HAVE_STRCASECMP	1
+#define HAVE_STRNCASECMP 1
+#define HAVE_SSCANF	1
+#define HAVE_SNPRINTF	1
+#define HAVE_VSNPRINTF	1
+#define HAVE_CEIL	1
+#define HAVE_COPYSIGN	1
+#define HAVE_COS	1
+#define HAVE_COSF	1
+#define HAVE_FABS	1
+#define HAVE_FLOOR	1
+#define HAVE_LOG	1
+#define HAVE_POW	1
+#define HAVE_SCALBN	1
+#define HAVE_SIN	1
+#define HAVE_SINF	1
+#define HAVE_SQRT	1
+#define HAVE_SIGACTION	1
+#define HAVE_SETJMP	1
+#define HAVE_NANOSLEEP	1
+#define HAVE_SYSCONF	1
+
 #define SIZEOF_VOIDP 4
 
 typedef unsigned int size_t;
@@ -57,11 +125,12 @@
 
 #define SDL_LOADSO_DISABLED 1
 
-#define SDL_THREADS_DISABLED 1
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD	1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
 
-#define SDL_TIMERS_DISABLED	1
-
-#define SDL_TIMER_UNIX 1
+/* Enable various timer systems */
+#define SDL_TIMER_UNIX	1
 
 #define SDL_VIDEO_DRIVER_ANDROID 1