Mercurial > sdl-ios-xcode
changeset 86:13e4c612098d
Dummy audio and video drivers are enabled (thanks Ryan!)
| author | Sam Lantinga <slouken@lokigames.com> |
|---|---|
| date | Mon, 02 Jul 2001 00:20:29 +0000 |
| parents | 60c7960354e0 |
| children | 3ef4bc90c388 |
| files | configure.in src/audio/disk/SDL_diskaudio.c src/video/dummy/SDL_nullvideo.c |
| diffstat | 3 files changed, 32 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Mon Jul 02 00:10:19 2001 +0000 +++ b/configure.in Mon Jul 02 00:20:29 2001 +0000 @@ -368,13 +368,12 @@ fi } - dnl rcg07142001 See if the user wants the disk writer audio driver... CheckDiskAudio() { AC_ARG_ENABLE(diskaudio, -[ --enable-diskaudio support the disk writer audio driver [default=no]], - , enable_diskaudio=no) +[ --enable-diskaudio support the disk writer audio driver [default=yes]], + , enable_diskaudio=yes) if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then CFLAGS="$CFLAGS -DDISKAUD_SUPPORT" AUDIO_SUBDIRS="$AUDIO_SUBDIRS disk" @@ -382,7 +381,6 @@ fi } - dnl See if we can use x86 assembly blitters CheckNASM() { @@ -810,8 +808,8 @@ CheckDummyVideo() { AC_ARG_ENABLE(video-dummy, -[ --enable-video-dummy use dummy video driver [default=no]], - , enable_video_dummy=no) +[ --enable-video-dummy use dummy video driver [default=yes]], + , enable_video_dummy=yes) if test x$enable_video_dummy = xyes; then CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO" VIDEO_SUBDIRS="$VIDEO_SUBDIRS dummy" @@ -902,7 +900,7 @@ , enable_pthreads=yes) dnl This is used on Linux for glibc binary compatibility (Doh!) AC_ARG_ENABLE(pthread-sem, -[ --enable-pthread-sem use pthread semaphores [default=yes]], +[ --enable-pthread-sem use pthread semaphores [default=yes]], , enable_pthread_sem=yes) ac_save_libs="$LIBS" case "$target" in
--- a/src/audio/disk/SDL_diskaudio.c Mon Jul 02 00:10:19 2001 +0000 +++ b/src/audio/disk/SDL_diskaudio.c Mon Jul 02 00:20:29 2001 +0000 @@ -80,23 +80,30 @@ int exists = 0; struct stat statbuf; const char *fname = DISKAUD_GetOutputFilename(); - + const char *envr = getenv("SDL_AUDIODRIVER"); available = 0; - if (stat(fname, &statbuf) == 0) - exists = 1; + if ((envr) && (strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) { + if (stat(fname, &statbuf) == 0) + exists = 1; - fd = open(fname, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR); - if ( fd != -1 ) { - available = 1; - close(fd); - if (!exists) { - unlink(fname); - } + fd = open(fname, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR); + if ( fd != -1 ) { + available = 1; + close(fd); + if (!exists) { + unlink(fname); + } + } } return(available); #else - return(1); + const char *envr = getenv("SDL_AUDIODRIVER"); + if ((envr) && (strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) { + return(1); + } + + return(0); #endif }
--- a/src/video/dummy/SDL_nullvideo.c Mon Jul 02 00:10:19 2001 +0000 +++ b/src/video/dummy/SDL_nullvideo.c Mon Jul 02 00:20:29 2001 +0000 @@ -55,6 +55,8 @@ #include "SDL_nullevents_c.h" #include "SDL_nullmouse_c.h" +#define DUMMYVID_DRIVER_NAME "dummy" + /* Initialization/Query functions */ static int DUMMY_VideoInit(_THIS, SDL_PixelFormat *vformat); static SDL_Rect **DUMMY_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags); @@ -76,7 +78,12 @@ static int DUMMY_Available(void) { - return 1; /* Always available ! */ + const char *envr = getenv("SDL_VIDEODRIVER"); + if ((envr) && (strcmp(envr, DUMMYVID_DRIVER_NAME) == 0)) { + return(1); + } + + return(0); } static void DUMMY_DeleteDevice(SDL_VideoDevice *device) @@ -136,7 +143,7 @@ } VideoBootStrap DUMMY_bootstrap = { - "dummy", "SDL dummy video driver", + DUMMYVID_DRIVER_NAME, "SDL dummy video driver", DUMMY_Available, DUMMY_CreateDevice };