SDL_AUDIO and SDL_JOYSTICK not needed
authorBradley Bell <btb@icculus.org>
Tue, 16 Jul 2002 22:37:14 +0000 (22:37 +0000)
committerBradley Bell <btb@icculus.org>
Tue, 16 Jul 2002 22:37:14 +0000 (22:37 +0000)
arch/sdl/event.c
arch/sdl/init.c
configure.ac

index 3cec462..9d13ed6 100644 (file)
@@ -1,12 +1,15 @@
 /*
  * $Source: /cvs/cvsroot/d2x/arch/sdl/event.c,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
  * $Author: bradleyb $
- * $Date: 2002-02-16 02:08:30 $
+ * $Date: 2002-07-16 22:37:14 $
  *
  * SDL Event related stuff
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.5  2002/02/16 02:08:30  bradleyb
+ * allow older sdl versions
+ *
  * Revision 1.4  2001/12/03 02:43:02  bradleyb
  * lots of makefile fixes, and sdl joystick stuff
  *
 extern void key_handler(SDL_KeyboardEvent *event);
 extern void mouse_button_handler(SDL_MouseButtonEvent *mbe);
 extern void mouse_motion_handler(SDL_MouseMotionEvent *mme);
-#ifdef SDL_JOYSTICK
 extern void joy_button_handler(SDL_JoyButtonEvent *jbe);
 extern void joy_axis_handler(SDL_JoyAxisEvent *jae);
-#endif
 
 static int initialised=0;
 
@@ -60,7 +61,6 @@ void event_poll()
                case SDL_MOUSEMOTION:
                        mouse_motion_handler((SDL_MouseMotionEvent *)&event);
                        break;
-#if SDL_JOYSTICK
                case SDL_JOYBUTTONDOWN:
                case SDL_JOYBUTTONUP:
                        joy_button_handler((SDL_JoyButtonEvent *)&event);
@@ -71,7 +71,6 @@ void event_poll()
                case SDL_JOYBALLMOTION:
                case SDL_JOYHATMOTION:
                        break;
-#endif
                case SDL_QUIT: {
                        void quit_request();
                        quit_request();
index 0634ddd..3a1485e 100644 (file)
@@ -1,12 +1,15 @@
 /*
  * $Source: /cvs/cvsroot/d2x/arch/sdl/init.c,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  * $Author: bradleyb $
- * $Date: 2001-12-03 02:45:02 $
+ * $Date: 2002-07-16 22:37:14 $
  *
  * SDL architecture support
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.8  2001/12/03 02:45:02  bradleyb
+ * fix formatting
+ *
  * Revision 1.7  2001/12/03 02:43:02  bradleyb
  * lots of makefile fixes, and sdl joystick stuff
  *
@@ -47,16 +50,11 @@ void sdl_close()
 void arch_sdl_init()
 {
        // Initialise the library
-       if (SDL_Init(
-#ifdef SDL_JOYSTICK
-               SDL_INIT_JOYSTICK |
-#endif
+       if (SDL_Init(SDL_INIT_JOYSTICK
 #if defined(SDL_VIDEO) || defined(SDL_GL_VIDEO)
-               SDL_INIT_VIDEO
-#else
-               0
+                                | SDL_INIT_VIDEO
 #endif
-               )<0) {
+       ) < 0) {
                Error("SDL library initialisation failed: %s.",SDL_GetError());
        }
 #ifdef SDL_INPUT
index 8ab2739..ee1d8ee 100644 (file)
@@ -266,9 +266,6 @@ AH_BOTTOM([
 #define NEWDEMO 1
 
 #ifdef __linux__
-# define SDL_AUDIO 1
-# define SDL_JOYSTICK 1
-
 # ifdef OGL
 #  define SDL_GL_VIDEO 1
 #  define SDL_INPUT 1
@@ -289,9 +286,7 @@ AH_BOTTOM([
 #endif
 
 #ifdef __MINGW32__
-# define SDL_AUDIO 1
 # define SDL_INPUT 1
-# define SDL_JOYSTICK 1
 # ifdef OGL
 #  define SDL_GL_VIDEO 1
 # else