Oops, I wasn't using pthreads. Fixed so we can have mutexes and stuff
authorPaul Hunkin <paul@bieh.net>
Tue, 27 Jul 2010 15:23:09 +0200
changeset 472080f8d672b52e
parent 4719 d59792d2c3ae
child 4721 7bb9d3a3f257
Oops, I wasn't using pthreads. Fixed so we can have mutexes and stuff
Makefile.android
include/SDL_config_android.h
     1.1 --- a/Makefile.android	Tue Jul 27 11:35:06 2010 +0200
     1.2 +++ b/Makefile.android	Tue Jul 27 15:23:09 2010 +0200
     1.3 @@ -33,8 +33,8 @@
     1.4  	src/joystick/dummy/*.c \
     1.5  	src/haptic/dummy/*.c \
     1.6  	src/atomic/dummy/*.c \
     1.7 -	src/thread/generic/*.c \
     1.8 -	src/timer/dummy/*.c \
     1.9 +	src/thread/pthread/*.c \
    1.10 +	src/timer/unix/*.c \
    1.11  	src/loadso/dummy/*.c \
    1.12  
    1.13  OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')
     2.1 --- a/include/SDL_config_android.h	Tue Jul 27 11:35:06 2010 +0200
     2.2 +++ b/include/SDL_config_android.h	Tue Jul 27 15:23:09 2010 +0200
     2.3 @@ -42,6 +42,74 @@
     2.4  typedef unsigned int uint32_t;
     2.5  */
     2.6  
     2.7 +
     2.8 +#define HAVE_ALLOCA_H		1
     2.9 +#define HAVE_SYS_TYPES_H	1
    2.10 +#define HAVE_STDIO_H	1
    2.11 +#define STDC_HEADERS	1
    2.12 +#define HAVE_STRING_H	1
    2.13 +#define HAVE_INTTYPES_H	1
    2.14 +#define HAVE_STDINT_H	1
    2.15 +#define HAVE_CTYPE_H	1
    2.16 +#define HAVE_MATH_H	1
    2.17 +#define HAVE_SIGNAL_H	1
    2.18 +
    2.19 +/* C library functions */
    2.20 +#define HAVE_MALLOC	1
    2.21 +#define HAVE_CALLOC	1
    2.22 +#define HAVE_REALLOC	1
    2.23 +#define HAVE_FREE	1
    2.24 +#define HAVE_ALLOCA	1
    2.25 +#define HAVE_GETENV	1
    2.26 +#define HAVE_SETENV	1
    2.27 +#define HAVE_PUTENV	1
    2.28 +#define HAVE_SETENV	1
    2.29 +#define HAVE_UNSETENV	1
    2.30 +#define HAVE_QSORT	1
    2.31 +#define HAVE_ABS	1
    2.32 +#define HAVE_BCOPY	1
    2.33 +#define HAVE_MEMSET	1
    2.34 +#define HAVE_MEMCPY	1
    2.35 +#define HAVE_MEMMOVE	1
    2.36 +#define HAVE_MEMCMP	1
    2.37 +#define HAVE_STRLEN	1
    2.38 +#define HAVE_STRLCPY	1
    2.39 +#define HAVE_STRLCAT	1
    2.40 +#define HAVE_STRDUP	1
    2.41 +#define HAVE_STRCHR	1
    2.42 +#define HAVE_STRRCHR	1
    2.43 +#define HAVE_STRSTR	1
    2.44 +#define HAVE_STRTOL	1
    2.45 +#define HAVE_STRTOUL	1
    2.46 +#define HAVE_STRTOLL	1
    2.47 +#define HAVE_STRTOULL	1
    2.48 +#define HAVE_STRTOD	1
    2.49 +#define HAVE_ATOI	1
    2.50 +#define HAVE_ATOF	1
    2.51 +#define HAVE_STRCMP	1
    2.52 +#define HAVE_STRNCMP	1
    2.53 +#define HAVE_STRCASECMP	1
    2.54 +#define HAVE_STRNCASECMP 1
    2.55 +#define HAVE_SSCANF	1
    2.56 +#define HAVE_SNPRINTF	1
    2.57 +#define HAVE_VSNPRINTF	1
    2.58 +#define HAVE_CEIL	1
    2.59 +#define HAVE_COPYSIGN	1
    2.60 +#define HAVE_COS	1
    2.61 +#define HAVE_COSF	1
    2.62 +#define HAVE_FABS	1
    2.63 +#define HAVE_FLOOR	1
    2.64 +#define HAVE_LOG	1
    2.65 +#define HAVE_POW	1
    2.66 +#define HAVE_SCALBN	1
    2.67 +#define HAVE_SIN	1
    2.68 +#define HAVE_SINF	1
    2.69 +#define HAVE_SQRT	1
    2.70 +#define HAVE_SIGACTION	1
    2.71 +#define HAVE_SETJMP	1
    2.72 +#define HAVE_NANOSLEEP	1
    2.73 +#define HAVE_SYSCONF	1
    2.74 +
    2.75  #define SIZEOF_VOIDP 4
    2.76  
    2.77  typedef unsigned int size_t;
    2.78 @@ -57,11 +125,12 @@
    2.79  
    2.80  #define SDL_LOADSO_DISABLED 1
    2.81  
    2.82 -#define SDL_THREADS_DISABLED 1
    2.83 +/* Enable various threading systems */
    2.84 +#define SDL_THREAD_PTHREAD	1
    2.85 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
    2.86  
    2.87 -#define SDL_TIMERS_DISABLED	1
    2.88 -
    2.89 -#define SDL_TIMER_UNIX 1
    2.90 +/* Enable various timer systems */
    2.91 +#define SDL_TIMER_UNIX	1
    2.92  
    2.93  #define SDL_VIDEO_DRIVER_ANDROID 1
    2.94