auto import from //branches/cupcake/...@130745

diff --git a/android-arm/kernel/kernel-qemu b/android-arm/kernel/kernel-qemu
index db22644..3bb1bb9 100755 (executable)
Binary files a/android-arm/kernel/kernel-qemu and b/android-arm/kernel/kernel-qemu differ

diff --git a/android-arm/kernel/vmlinux-qemu b/android-arm/kernel/vmlinux-qemu
index 7440e85..8506486 100755 (executable)
Binary files a/android-arm/kernel/vmlinux-qemu and b/android-arm/kernel/vmlinux-qemu differ

diff --git a/darwin-x86/sdl/include/SDL/SDL_syswm.h b/darwin-x86/sdl/include/SDL/SDL_syswm.h
index 010dd1b..0502037 100644 (file)
--- a/darwin-x86/sdl/include/SDL/SDL_syswm.h
+++ b/darwin-x86/sdl/include/SDL/SDL_syswm.h
@@ -172,6 +172,18 @@ typedef struct SDL_SysWMinfo {
        int data;
 } SDL_SysWMinfo;
 
+#elif defined(SDL_VIDEO_DRIVER_QUARTZ)
+
+struct SDL_SysWMmsg {
+       SDL_version version;
+       int data;
+};
+
+typedef struct SDL_SysWMinfo {
+        SDL_version version;
+        void* nsWindowPtr;
+} SDL_SysWMinfo;
+
 #else
 
 /* The generic custom event structure */

diff --git a/darwin-x86/sdl/lib/libSDL.a b/darwin-x86/sdl/lib/libSDL.a
index 125fee8..affdb93 100644 (file)
Binary files a/darwin-x86/sdl/lib/libSDL.a and b/darwin-x86/sdl/lib/libSDL.a differ

diff --git a/darwin-x86/sdl/lib/libSDL.la b/darwin-x86/sdl/lib/libSDL.la
index 5a2ee08..fae0c57 100644 (file)
--- a/darwin-x86/sdl/lib/libSDL.la
+++ b/darwin-x86/sdl/lib/libSDL.la
@@ -32,4 +32,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Volumes/sources/android/device/prebuilt/darwin-x86/sdl/lib'
+libdir='/Volumes/Android/cupcake/prebuilt/darwin-x86/sdl/lib'

diff --git a/darwin-x86/sdl/lib/libSDLmain.a b/darwin-x86/sdl/lib/libSDLmain.a
index c2e735d..a9ea189 100644 (file)
Binary files a/darwin-x86/sdl/lib/libSDLmain.a and b/darwin-x86/sdl/lib/libSDLmain.a differ

diff --git a/linux-x86/sdl/bin/sdl-config b/linux-x86/sdl/bin/sdl-config
index 95e8f57..85ed554 100755 (executable)
--- a/linux-x86/sdl/bin/sdl-config
+++ b/linux-x86/sdl/bin/sdl-config
@@ -9,15 +9,13 @@ libdir=${exec_prefix}/lib
 #usage="\
 #Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
 usage="\
-Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs] [--ldflags]"
+Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
 
 if test $# -eq 0; then
       echo "${usage}" 1>&2
       exit 1
 fi
 
-LDFLAGS="-lm -ldl -lpthread"
-
 while test $# -gt 0; do
   case "$1" in
   -*=*) optarg=`echo "$1" | LC_ALL="C" sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -52,10 +50,7 @@ while test $# -gt 0; do
 #      ;;
 #    --static-libs)
     --libs|--static-libs)
-      echo ${libdir}/libSDLmain.a ${libdir}/libSDL.a $LDFLAGS
-      ;;
-    --ldflags)
-      echo $LDFLAGS
+      echo ${libdir}/libSDLmain.a ${libdir}/libSDL.a  -lm -ldl -lpthread
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/linux-x86/sdl/include/SDL/SDL_config.h b/linux-x86/sdl/include/SDL/SDL_config.h
index 98feeb2..9bd4982 100644 (file)
--- a/linux-x86/sdl/include/SDL/SDL_config.h
+++ b/linux-x86/sdl/include/SDL/SDL_config.h
@@ -171,8 +171,8 @@
 /* #undef SDL_AUDIO_DRIVER_DSOUND */
 /* #undef SDL_AUDIO_DRIVER_PULSE */
 /* #undef SDL_AUDIO_DRIVER_PULSE_DYNAMIC */
-/* #undef SDL_AUDIO_DRIVER_ESD */
-/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
+#define SDL_AUDIO_DRIVER_ESD 1
+#define SDL_AUDIO_DRIVER_ESD_DYNAMIC "libesd.so.0"
 /* #undef SDL_AUDIO_DRIVER_MINT */
 /* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
 /* #undef SDL_AUDIO_DRIVER_NAS */

diff --git a/linux-x86/sdl/lib/libSDL.a b/linux-x86/sdl/lib/libSDL.a
index 9d86d80..64b4ad9 100644 (file)
Binary files a/linux-x86/sdl/lib/libSDL.a and b/linux-x86/sdl/lib/libSDL.a differ

diff --git a/linux-x86/sdl/lib/libSDL.la b/linux-x86/sdl/lib/libSDL.la
index 263c058..0aa8096 100755 (executable)
--- a/linux-x86/sdl/lib/libSDL.la
+++ b/linux-x86/sdl/lib/libSDL.la
@@ -32,4 +32,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/opt/android/main/device/prebuilt/Linux/sdl/lib'
+libdir='/opt/digit/cupcake/android/prebuilt/linux-x86/sdl/lib'

diff --git a/linux-x86/sdl/lib/libSDLmain.a b/linux-x86/sdl/lib/libSDLmain.a
index 56176e7..85b0b45 100644 (file)
Binary files a/linux-x86/sdl/lib/libSDLmain.a and b/linux-x86/sdl/lib/libSDLmain.a differ

diff --git a/linux-x86/sdl/lib/pkgconfig/sdl.pc b/linux-x86/sdl/lib/pkgconfig/sdl.pc
index 14d366d..6819853 100644 (file)
--- a/linux-x86/sdl/lib/pkgconfig/sdl.pc
+++ b/linux-x86/sdl/lib/pkgconfig/sdl.pc
@@ -1,6 +1,6 @@
 # sdl pkg-config source file
 
-prefix=/opt/android/main/device/prebuilt/Linux/sdl
+prefix=/opt/digit/cupcake/android/prebuilt/linux-x86/sdl
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include