diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-20 04:19:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-20 04:19:21 +0400 |
commit | 4512f10db981bdd9083bd6763fc993f2a162ac53 (patch) | |
tree | e5056a5d2e8ae92a5a91a009ac05ccf6244ba061 /source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp | |
parent | 5cf593a778e3dca51a5ebd6b4c23ce6c7b0a7ac6 (diff) |
misc edits
- rename define DISABLE_SDL --> WITH_SDL (which was already used in some places)
- blenders interation preset was using orbit rather then turntable 3d view preference (different from factory defaults).
- tagged some unused rna args.
Diffstat (limited to 'source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp')
-rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp index b6e313aa6c2..e1ab364ae67 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp @@ -29,15 +29,15 @@ * \ingroup gamelogic */ -#ifndef DISABLE_SDL -#include <SDL.h> +#ifdef WITH_SDL +# include <SDL.h> #endif #include "SCA_Joystick.h" #include "SCA_JoystickPrivate.h" -#ifndef DISABLE_SDL +#ifdef WITH_SDL void SCA_Joystick::OnAxisMotion(SDL_Event* sdl_event) { if(sdl_event->jaxis.axis >= JOYAXIS_MAX) @@ -125,4 +125,4 @@ void SCA_Joystick::HandleEvents(void) } } } -#endif +#endif /* WITH_SDL */ |