diff options
| author | Darshan Kadu <darsh7807@gmail.com> | 2017-09-10 15:41:40 +0300 |
|---|---|---|
| committer | Darshan Kadu <darsh7807@gmail.com> | 2017-09-10 15:41:40 +0300 |
| commit | 6594fa1ce02809a275c9cd488fa0223d03d73571 (patch) | |
| tree | 0bcd95846e1e3b09239126b40ef434ed3dc3a50d /source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | |
| parent | f2017083a19e5c83aadc575625dce0642ffce6c5 (diff) | |
merged the master branchsoc-2017-vertex_paint
Diffstat (limited to 'source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp')
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp index 1a66b2aee52..9f532527a80 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -38,7 +38,11 @@ #include "BLI_path_util.h" #ifdef WITH_SDL -# define SDL_CHECK(x) ((x) != (void *)0) +# ifdef WITH_SDL_DYNLOAD +# define SDL_CHECK(x) ((x) != (void *)0) +# else +# define SDL_CHECK(x) true +# endif #endif SCA_Joystick::SCA_Joystick(short int index) |