From: Holger Schemel Date: Fri, 1 Sep 2000 18:14:28 +0000 (+0200) Subject: rnd-20000901-2-src X-Git-Tag: 2.0.0^2~44 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=d5b2ac0f473b0868014826e2c6488c72c79008f1;p=rocksndiamonds.git rnd-20000901-2-src --- diff --git a/src/Makefile b/src/Makefile index 0dad3f3d..1c20496f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -36,8 +36,8 @@ endif USE_SDL = true # USE_SDL = false -# USE_SDL_OLD_LIBS = true -USE_SDL_OLD_LIBS = false +USE_SDL_OLD_LIBS = true +# USE_SDL_OLD_LIBS = false ifeq ($(USE_SDL_OLD_LIBS),true) SDL_EXTRA_LIBS = -lIMG -lmixer diff --git a/src/events.c b/src/events.c index a46f3548..d3f8196b 100644 --- a/src/events.c +++ b/src/events.c @@ -121,7 +121,7 @@ void HandleOtherEvents(Event *event) HandleClientMessageEvent((ClientMessageEvent *) event); break; -#ifdef USE_SDL_LIBRARY +#ifdef USE_SDL_JOYSTICK case SDL_JOYAXISMOTION: case SDL_JOYBUTTONDOWN: case SDL_JOYBUTTONUP: diff --git a/src/init.c b/src/init.c index 7d97072e..f1c7ffd9 100644 --- a/src/init.c +++ b/src/init.c @@ -282,7 +282,7 @@ void InitSoundServer() void InitJoysticks() { -#ifdef USE_SDL_LIBRARY +#ifdef USE_SDL_JOYSTICK static boolean sdl_joystick_subsystem_initialized = FALSE; #endif @@ -293,7 +293,7 @@ void InitJoysticks() joystick_status = JOYSTICK_OFF; -#ifdef USE_SDL_LIBRARY +#ifdef USE_SDL_JOYSTICK if (!sdl_joystick_subsystem_initialized) { @@ -333,7 +333,7 @@ void InitJoysticks() joystick_status = JOYSTICK_AVAILABLE; } -#else /* !USE_SDL_LIBRARY */ +#else /* !USE_SDL_JOYSTICK */ #ifndef MSDOS for (i=0; i= 1 && SDL_MINOR_VERSION >= 1 #include "SDL_image.h" #include "SDL_mixer.h" +#define USE_SDL_JOYSTICK #else #include "IMG.h" #include "mixer.h"