From 63e644f0869fe9ab49867daba736cc45e2f85329 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Fri, 14 May 2010 14:02:19 -0700 Subject: Disable audio support in our custom SDL build. This is not needed anymore. Change-Id: Id41b71c95566804b92185282bb51e317efc67255 --- distrib/sdl-1.2.12/android-configure.sh | 19 ++++--------------- .../sdl-1.2.12/android/build/darwin-x86/SDL_config.h | 2 +- .../sdl-1.2.12/android/build/freebsd-x86/SDL_config.h | 2 +- .../sdl-1.2.12/android/build/linux-x86/SDL_config.h | 2 +- distrib/sdl-1.2.12/android/build/windows/SDL_config.h | 2 +- 5 files changed, 8 insertions(+), 19 deletions(-) (limited to 'distrib') 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 diff --git a/distrib/sdl-1.2.12/android/build/darwin-x86/SDL_config.h b/distrib/sdl-1.2.12/android/build/darwin-x86/SDL_config.h index 98263ed..f2d3b68 100644 --- a/distrib/sdl-1.2.12/android/build/darwin-x86/SDL_config.h +++ b/distrib/sdl-1.2.12/android/build/darwin-x86/SDL_config.h @@ -89,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 */ diff --git a/distrib/sdl-1.2.12/android/build/freebsd-x86/SDL_config.h b/distrib/sdl-1.2.12/android/build/freebsd-x86/SDL_config.h index 302a22a..1186322 100644 --- a/distrib/sdl-1.2.12/android/build/freebsd-x86/SDL_config.h +++ b/distrib/sdl-1.2.12/android/build/freebsd-x86/SDL_config.h @@ -89,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 */ diff --git a/distrib/sdl-1.2.12/android/build/linux-x86/SDL_config.h b/distrib/sdl-1.2.12/android/build/linux-x86/SDL_config.h index d02e4ed..637a42d 100644 --- a/distrib/sdl-1.2.12/android/build/linux-x86/SDL_config.h +++ b/distrib/sdl-1.2.12/android/build/linux-x86/SDL_config.h @@ -84,7 +84,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 */ diff --git a/distrib/sdl-1.2.12/android/build/windows/SDL_config.h b/distrib/sdl-1.2.12/android/build/windows/SDL_config.h index 8c47a2b..06cbe6c 100644 --- a/distrib/sdl-1.2.12/android/build/windows/SDL_config.h +++ b/distrib/sdl-1.2.12/android/build/windows/SDL_config.h @@ -89,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 */ -- cgit v1.1