diff options
author | David 'Digit' Turner <digit@android.com> | 2010-05-14 14:02:19 -0700 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2010-05-14 14:02:19 -0700 |
commit | 63e644f0869fe9ab49867daba736cc45e2f85329 (patch) | |
tree | 75fd493e7d183e9177cc20f72bbe175690b10e89 /distrib/sdl-1.2.12/android-configure.sh | |
parent | d27aca1c8172462c6e834c3c42582106b36aa422 (diff) | |
download | external_qemu-63e644f0869fe9ab49867daba736cc45e2f85329.zip external_qemu-63e644f0869fe9ab49867daba736cc45e2f85329.tar.gz external_qemu-63e644f0869fe9ab49867daba736cc45e2f85329.tar.bz2 |
Disable audio support in our custom SDL build.
This is not needed anymore.
Change-Id: Id41b71c95566804b92185282bb51e317efc67255
Diffstat (limited to 'distrib/sdl-1.2.12/android-configure.sh')
-rwxr-xr-x | distrib/sdl-1.2.12/android-configure.sh | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/distrib/sdl-1.2.12/android-configure.sh b/distrib/sdl-1.2.12/android-configure.sh index c367ed3..a61ad78 100755 --- a/distrib/sdl-1.2.12/android-configure.sh +++ b/distrib/sdl-1.2.12/android-configure.sh @@ -212,10 +212,10 @@ config_add_macro () } # used to add host-os-specific driver macros to the config file -# $1 : driver prefix, e.g. DRIVERS_AUDIO +# $1 : driver prefix, e.g. DRIVERS_VIDEO # $2 : macro prefix -# this will look for DRIVERS_AUDIO_${HOST_OS}, and, if it is not -# defined in DRIVERS_AUDIO_default +# this will look for DRIVERS_VIDEO_${HOST_OS}, and, if it is not +# defined in DRIVERS_VIDEO_default # # then this will call 'config_add ${2}_${driver}' for each driver listed # @@ -378,7 +378,7 @@ generate_SDL_config_h () config_add "/* Allow disabling of core subsystems */" - config_add_macro SDL_AUDIO_DISABLED no + config_add_macro SDL_AUDIO_DISABLED yes config_add_macro SDL_CDROM_DISABLED yes config_add_macro SDL_CPUINFO_DISABLED no config_add_macro SDL_EVENTS_DISABLED no @@ -390,11 +390,6 @@ generate_SDL_config_h () config_add_macro SDL_VIDEO_DISABLED no config_add "" - config_add "/* Enable various audio drivers */" - - config_add_driver_macros DRIVERS_AUDIO SDL_AUDIO_DRIVER - - config_add "" config_add "/* Enable various shared object loading systems */" config_add_driver_macros DRIVERS_LOADSO SDL_LOADSO @@ -462,7 +457,6 @@ generate_sdl_config_mk () make_add "CONFIG_LIBC := $CONFIG_LIBC" make_add "CONFIG_CPUINFO := yes" - make_add_driver_macros DRIVERS_AUDIO CONFIG_AUDIO make_add_driver_macros DRIVERS_LOADSO CONFIG_LOADSO make_add_driver_macros DRIVERS_THREAD CONFIG_THREAD make_add_driver_macros DRIVERS_TIMER CONFIG_TIMER @@ -535,11 +529,6 @@ generate_all () copy_or_autodetect sdl-config generate_sdl_config } -DRIVERS_AUDIO_default="OSS" -DRIVERS_AUDIO_linux="ALSA ALSA_DYNAMIC OSS ESD_DYNAMIC ESD" -DRIVERS_AUDIO_darwin="COREAUDIO" -DRIVERS_AUDIO_windows="WAVEOUT" - DRIVERS_LOADSO_default=DLOPEN DRIVERS_LOADSO_darwin=DLCOMPAT DRIVERS_LOADSO_windows=WIN32 |