diff options
author | David 'Digit' Turner <digit@android.com> | 2010-05-18 17:02:33 -0700 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2010-05-18 17:02:33 -0700 |
commit | 34d165185730eac6ddc4e7a23d192d22aa3d4dfb (patch) | |
tree | 8f65fdba4ae95ef1f4e96e5492943d581637cbce /distrib/sdl-1.2.12/android-configure.sh | |
parent | 54808b6e68ab5be7d2a10b772f1ae4f569d542a1 (diff) | |
download | external_qemu-34d165185730eac6ddc4e7a23d192d22aa3d4dfb.zip external_qemu-34d165185730eac6ddc4e7a23d192d22aa3d4dfb.tar.gz external_qemu-34d165185730eac6ddc4e7a23d192d22aa3d4dfb.tar.bz2 |
Build SDL from sources directly.
This removes the requirement to build the SDL library before the rest
of the emulator. The prebuilt SDL library and installation is now optional
and is only kept for the full Android build on Linux (mainly to avoid having
to install many dev libraries on build servers).
This patch affects both the Android and standalone build systems.
The script android-configure.sh will not use a prebuilt SDL installation
unless you explicitely use --sdl-config=<script>.
Tested for linux-x86 / darwin-x86 / cygwin / linux-mingw builds.
Change-Id: If973b2ad199f06aeeff43aec387d1ac629487529
Diffstat (limited to 'distrib/sdl-1.2.12/android-configure.sh')
-rwxr-xr-x | distrib/sdl-1.2.12/android-configure.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/distrib/sdl-1.2.12/android-configure.sh b/distrib/sdl-1.2.12/android-configure.sh index a61ad78..133daf4 100755 --- a/distrib/sdl-1.2.12/android-configure.sh +++ b/distrib/sdl-1.2.12/android-configure.sh @@ -157,7 +157,7 @@ case "$HOST_OS" in ;; darwin) SDL_CFLAGS="-D_GNU_SOURCE=1 -D_THREAD_SAFE" - SDL_STATIC_LIBS="-Wl,-framework,OpenGL -Wl,-framework,Cocoa -Wl,-framework,QuickTime -Wl,-framework,ApplicationServices -Wl,-framework,Carbon -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit -Wl,-framework,IOKit" + SDL_STATIC_LIBS="-Wl,-framework,OpenGL -Wl,-framework,Cocoa -Wl,-framework,QuickTime -Wl,-framework,ApplicationServices -Wl,-framework,Carbon -Wl,-framework,IOKit" ;; windows) SDL_CFLAGS="-D_GNU_SOURCE=1 -Dmain=SDL_main" @@ -439,7 +439,7 @@ make_add_driver_macros () driver_list="`var_value ${1}_default`" fi for driver_name in $driver_list; do - make_add "$2_${driver_name} := yes" + make_add "SDL_$2_${driver_name} := yes" done } @@ -454,8 +454,8 @@ generate_sdl_config_mk () make_add "SRC_PATH=$PWD" make_add "BUILD_SYSTEM=$ANDROID_QEMU_PATH/android/build" - make_add "CONFIG_LIBC := $CONFIG_LIBC" - make_add "CONFIG_CPUINFO := yes" + make_add "SDL_CONFIG_LIBC := $CONFIG_LIBC" + make_add "SDL_CONFIG_CPUINFO := yes" make_add_driver_macros DRIVERS_LOADSO CONFIG_LOADSO make_add_driver_macros DRIVERS_THREAD CONFIG_THREAD |