Mercurial > sdl-ios-xcode
diff src/audio/alsa/SDL_alsa_audio.c @ 1361:19418e4422cb
New configure-based build system. Still work in progress, but much improved
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 16 Feb 2006 10:11:48 +0000 |
| parents | c71e05b4dc2e |
| children | c0a74f199ecf |
line wrap: on
line diff
--- a/src/audio/alsa/SDL_alsa_audio.c Fri Feb 10 07:29:08 2006 +0000 +++ b/src/audio/alsa/SDL_alsa_audio.c Thu Feb 16 10:11:48 2006 +0000 @@ -27,18 +27,13 @@ #include <sys/types.h> #include <signal.h> /* For kill() */ +#include "SDL_timer.h" #include "SDL_audio.h" -#include "SDL_audiomem.h" -#include "SDL_audio_c.h" -#include "SDL_timer.h" +#include "../SDL_audiomem.h" +#include "../SDL_audio_c.h" #include "SDL_alsa_audio.h" -#ifdef ALSA_DYNAMIC -#ifdef USE_DLVSYM -#ifndef __USE_GNU -#define __USE_GNU -#endif -#endif +#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC #include <dlfcn.h> #include "SDL_name.h" #include "SDL_loadso.h" @@ -60,9 +55,9 @@ static Uint8 *ALSA_GetAudioBuf(_THIS); static void ALSA_CloseAudio(_THIS); -#ifdef ALSA_DYNAMIC +#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC -static const char *alsa_library = ALSA_DYNAMIC; +static const char *alsa_library = SDL_AUDIO_DRIVER_ALSA_DYNAMIC; static void *alsa_handle = NULL; static int alsa_loaded = 0; @@ -131,7 +126,7 @@ retval = 0; for (i = 0; i < SDL_TABLESIZE(alsa_functions); i++) { /* *alsa_functions[i].func = SDL_LoadFunction(alsa_handle,alsa_functions[i].name);*/ -#ifdef USE_DLVSYM +#if HAVE_DLVSYM *alsa_functions[i].func = dlvsym(alsa_handle,alsa_functions[i].name,"ALSA_0.9"); if (!*alsa_functions[i].func) #endif @@ -156,7 +151,7 @@ return 0; } -#endif /* ALSA_DYNAMIC */ +#endif /* SDL_AUDIO_DRIVER_ALSA_DYNAMIC */ static const char *get_audio_device(int channels) {