Merge changes I11cf3610,I09d6cba7
* changes:
New lib64SDL.a and lib64SDLmain.a for 64-bit emulator
Update linux-x86/SDL with X threading bugfix
diff --git a/linux-x86/sdl/PREBUILT b/linux-x86/sdl/PREBUILT
index 769fa6a..ba4430a 100644
--- a/linux-x86/sdl/PREBUILT
+++ b/linux-x86/sdl/PREBUILT
@@ -1,6 +1,20 @@
-The objects in this prebuilt directory can be rebuilt
-using the source archive
+The objects in this prebuilt directory can be rebuilt from the source in
+$ANDROID/external/qemu/distrib/sdl-1.2.12.
-sdl-1.2.12-android-20080919.tar.gz
+The current version was built from commit
+ <562240d8235c122b1624713169cd0764d84956d2>
+with the commands
-hosted at <http://android.kernel.org/pub/>.
+For 32-bit
+$ cd $ANDROID/external/qemu/distrib/sdl-1.2.12
+$ ./android-configure.sh
+$ make
+$ make install
+$ cp -a out/linux-x86/* $ANDROID/prebuilt/linux-x86/sdl
+
+To add 64-bit *.a (after successful 32-bit build)
+$ cd $ANDROID/external/qemu/distrib/sdl-1.2.12
+$ ./android-configure.sh --try-64
+$ make
+$ cp objs/libs/libSDL.a $ANDROID/prebuilt/linux-x86/sdl/libs/lib64SDL.a
+$ cp objs/libs/libSDLmain.a $ANDROID/prebuilt/linux-x86/sdl/libs/lib64SDLmain.a
diff --git a/linux-x86/sdl/bin/sdl-config b/linux-x86/sdl/bin/sdl-config
index ea12914..7312f67 100755
--- a/linux-x86/sdl/bin/sdl-config
+++ b/linux-x86/sdl/bin/sdl-config
@@ -4,7 +4,7 @@
prefix=`dirname $curdir`
exec_prefix=${prefix}
exec_prefix_set=no
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/libs
#usage="\
#Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
@@ -46,7 +46,7 @@
echo -I${prefix}/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
;;
# --libs)
-# echo -L${exec_prefix}/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
+# echo -L${exec_prefix}/libs @SDL_RLD_FLAGS@ @SDL_LIBS@
# ;;
# --static-libs)
--libs|--static-libs)
diff --git a/linux-x86/sdl/include/SDL/SDL_config.h b/linux-x86/sdl/include/SDL/SDL_config.h
index d02e4ed..529beb0 100644
--- a/linux-x86/sdl/include/SDL/SDL_config.h
+++ b/linux-x86/sdl/include/SDL/SDL_config.h
@@ -2,6 +2,11 @@
#ifndef _SDL_config_h
#define _SDL_config_h
+#include "SDL_platform.h"
+
+#define SDL_HAS_64BIT_TYPE 1
+#define SDL_BYTEORDER 1234
+
#define HAVE_LIBC 1
#if HAVE_LIBC
@@ -84,7 +89,7 @@
#endif /* HAVE_LIBC */
/* Allow disabling of core subsystems */
-/* #undef SDL_AUDIO_DISABLED */
+#define SDL_AUDIO_DISABLED 1
#define SDL_CDROM_DISABLED 1
/* #undef SDL_CPUINFO_DISABLED */
/* #undef SDL_EVENTS_DISABLED */
@@ -95,13 +100,6 @@
/* #undef SDL_TIMERS_DISABLED */
/* #undef SDL_VIDEO_DISABLED */
-/* Enable various audio drivers */
-#define SDL_AUDIO_DRIVER_ALSA 1
-#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC 1
-#define SDL_AUDIO_DRIVER_OSS 1
-#define SDL_AUDIO_DRIVER_ESD_DYNAMIC 1
-#define SDL_AUDIO_DRIVER_ESD 1
-
/* Enable various shared object loading systems */
#define SDL_LOADSO_DLOPEN 1
diff --git a/linux-x86/sdl/lib/libSDL.a b/linux-x86/sdl/lib/libSDL.a
deleted file mode 100644
index 9d2e8aa..0000000
--- a/linux-x86/sdl/lib/libSDL.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/sdl/lib/libSDL.la b/linux-x86/sdl/lib/libSDL.la
deleted file mode 100755
index 0aa8096..0000000
--- a/linux-x86/sdl/lib/libSDL.la
+++ /dev/null
@@ -1,35 +0,0 @@
-# libSDL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names=''
-
-# The name of the static archive.
-old_library='libSDL.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lm -ldl -lpthread'
-
-# Version information for libSDL.
-current=11
-age=11
-revision=1
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-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
deleted file mode 100644
index e29fc62..0000000
--- a/linux-x86/sdl/lib/libSDLmain.a
+++ /dev/null
Binary files differ
diff --git a/linux-x86/sdl/lib/pkgconfig/sdl.pc b/linux-x86/sdl/lib/pkgconfig/sdl.pc
deleted file mode 100644
index 6819853..0000000
--- a/linux-x86/sdl/lib/pkgconfig/sdl.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-# sdl pkg-config source file
-
-prefix=/opt/digit/cupcake/android/prebuilt/linux-x86/sdl
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: sdl
-Description: Simple DirectMedia Layer is a cross-platform multimedia library designed to provide low level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.
-Version: 1.2.12
-Requires:
-Conflicts:
-Libs: -L${libdir} -lSDL -lpthread
-Cflags: -I${includedir}/SDL -D_GNU_SOURCE=1 -D_REENTRANT
diff --git a/linux-x86/sdl/lib/Android.mk b/linux-x86/sdl/libs/Android.mk
similarity index 71%
rename from linux-x86/sdl/lib/Android.mk
rename to linux-x86/sdl/libs/Android.mk
index 2f5a292..b3322ee 100644
--- a/linux-x86/sdl/lib/Android.mk
+++ b/linux-x86/sdl/libs/Android.mk
@@ -3,6 +3,8 @@
LOCAL_PREBUILT_LIBS := \
libSDL.a \
- libSDLmain.a
+ libSDLmain.a \
+ lib64SDL.a \
+ lib64SDLmain.a
include $(BUILD_HOST_PREBUILT)
diff --git a/linux-x86/sdl/libs/lib64SDL.a b/linux-x86/sdl/libs/lib64SDL.a
new file mode 100644
index 0000000..65983f4
--- /dev/null
+++ b/linux-x86/sdl/libs/lib64SDL.a
Binary files differ
diff --git a/linux-x86/sdl/libs/lib64SDLmain.a b/linux-x86/sdl/libs/lib64SDLmain.a
new file mode 100644
index 0000000..e6ac233
--- /dev/null
+++ b/linux-x86/sdl/libs/lib64SDLmain.a
Binary files differ
diff --git a/linux-x86/sdl/libs/libSDL.a b/linux-x86/sdl/libs/libSDL.a
new file mode 100644
index 0000000..899669d
--- /dev/null
+++ b/linux-x86/sdl/libs/libSDL.a
Binary files differ
diff --git a/linux-x86/sdl/libs/libSDLmain.a b/linux-x86/sdl/libs/libSDLmain.a
new file mode 100644
index 0000000..bb0461b
--- /dev/null
+++ b/linux-x86/sdl/libs/libSDLmain.a
Binary files differ
