Rename USE_SDL build flag to USE_SDL_AUDIO so that we can still build

with SDL audio if we need to in the future.

src/xpdev/Common.gmake

@@ -70,32 +70,32 @@ ifeq ($(os),darwin)
 endif
 
 # Find SDL headers!
-ifndef WITHOUT_SDL
+ifdef USE_SDL_AUDIO
  ifdef SDL_CONFIG
   ifeq ($(shell ${SDL_CONFIG} --cflags > /dev/null 2>&1 && echo YES),YES)
-   WITH_SDL	:=	1
+   WITH_SDL_AUDIO	:=	1
   endif
  else
   ifeq ($(os),darwin)
    ifeq ($(shell if [ -d /Library/Frameworks/SDL.framework ] ; then echo YES ; fi),YES)
-    WITH_SDL	:=	1
+    WITH_SDL_AUDIO	:=	1
    endif
   else
    ifeq ($(shell sdl-config --cflags > /dev/null 2>&1 && echo YES),YES)
     SDL_CONFIG := sdl-config
-    WITH_SDL	:=	1
+    WITH_SDL_AUDIO	:=	1
    else
     ifeq ($(shell sdl13-config --cflags > /dev/null 2>&1 && echo YES),YES)
      SDL_CONFIG := sdl13-config
-     WITH_SDL	:=	1
+     WITH_SDL_AUDIO	:=	1
     else
      ifeq ($(shell sdl12-config --cflags > /dev/null 2>&1 && echo YES),YES)
       SDL_CONFIG := sdl12-config
-      WITH_SDL	:=	1
+      WITH_SDL_AUDIO	:=	1
      else
       ifeq ($(shell sdl11-config --cflags > /dev/null 2>&1 && echo YES),YES)
        SDL_CONFIG := sdl11-config
-       WITH_SDL	:=	1
+       WITH_SDL_AUDIO	:=	1
       endif
      endif
     endif
@@ -104,12 +104,12 @@ ifndef WITHOUT_SDL
  endif
 endif
 
-ifdef WITH_SDL
+ifdef WITH_SDL_AUDIO
  ifdef SDL_CONFIG
   ifeq ($(shell ${SDL_CONFIG} --cflags > /dev/null 2>&1 && echo YES),YES)
-   XPDEV-MT_CFLAGS	+=	-DWITH_SDL
+   XPDEV-MT_CFLAGS	+=	-DWITH_SDL_AUDIO
    XPDEV-MT_CFLAGS	+=	$(shell $(SDL_CONFIG) --cflags)
-   XPDEV_CFLAGS	+=	-DWITH_SDL
+   XPDEV_CFLAGS	+=	-DWITH_SDL_AUDIO
    XPDEV_CFLAGS	+=	$(shell $(SDL_CONFIG) --cflags)
    ifdef STATIC_SDL
     XPDEV-MT_LIBS	+=	$(shell $(SDL_CONFIG) --static-libs)
@@ -133,10 +133,10 @@ ifdef WITH_SDL
   endif
  else
   ifeq ($(os),darwin)
-   XPDEV-MT_CFLAGS	+=	-DWITH_SDL -DSTATIC_SDL
+   XPDEV-MT_CFLAGS	+=	-DWITH_SDL_AUDIO -DSTATIC_SDL
    XPDEV-MT_CFLAGS	+=	-I/Library/Frameworks/SDL.framework/Headers
    XPDEV-MT_LIBS	+=	-framework SDL -framework Cocoa -framework Carbon -I/Library/Frameworks/SDL.framework/Headers
-   XPDEV_CFLAGS	+=	-DWITH_SDL -DSTATIC_SDL
+   XPDEV_CFLAGS	+=	-DWITH_SDL_AUDIO -DSTATIC_SDL
    XPDEV_CFLAGS	+=	-I/Library/Frameworks/SDL.framework/Headers
    XPDEV_LIBS	+=	-framework SDL -framework Cocoa -framework Carbon -I/Library/Frameworks/SDL.framework/Headers
   endif

src/xpdev/gen_defs.h

@@ -354,7 +354,7 @@ typedef struct {
 #endif
 
 /* Special hackery for SDL */
-#ifdef WITH_SDL
+#ifdef WITH_SDL_AUDIO
 	#include <SDL.h>
 
 	#ifdef main

src/xpdev/xpbeep.c

@@ -49,7 +49,7 @@
 #include "portaudio.h"
 #endif
 
-#ifdef WITH_SDL
+#ifdef WITH_SDL_AUDIO
 #include "sdlfuncs.h"
 #endif
 
@@ -82,7 +82,7 @@ static unsigned char	pawave[S_RATE*15/2+1];
 static int				portaudio_initialized=FALSE;
 #endif
 
-#ifdef WITH_SDL
+#ifdef WITH_SDL_AUDIO
 static SDL_AudioSpec	spec;
 static int				sdl_audio_buf_len=0;
 static int				sdl_audio_buf_pos=0;
@@ -231,7 +231,7 @@ static int portaudio_callback(void *inputBuffer
 }
 #endif
 
-#ifdef WITH_SDL
+#ifdef WITH_SDL_AUDIO
 void sdl_fillbuf(void *userdata, Uint8 *stream, int len)
 {
 	int	copylen=len;
@@ -297,7 +297,7 @@ BOOL xptone_open(void)
 	}
 #endif
 
-#ifdef WITH_SDL
+#ifdef WITH_SDL_AUDIO
 	if(!sdl_device_open_failed) {
 		if(init_sdl_audio()==-1)
 			sdl_device_open_failed=TRUE;
@@ -438,7 +438,7 @@ BOOL xptone_close(void)
 	}
 #endif
 
-#ifdef WITH_SDL
+#ifdef WITH_SDL_AUDIO
 	if(handle_type==SOUND_DEVICE_SDL) {
 		sdl.CloseAudio();
 		sdl.SDL_DestroySemaphore(sdlToneDone);
@@ -513,7 +513,7 @@ BOOL DLLCALL xptone(double freq, DWORD duration, enum WAVE_SHAPE shape)
 	}
 #endif
 
-#ifdef WITH_SDL
+#ifdef WITH_SDL_AUDIO
 	if(handle_type==SOUND_DEVICE_SDL) {
 		sdl.LockAudio();
 		sdl_audio_buf_pos=0;