diff options
| author | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
|---|---|---|
| committer | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
| commit | 2b1ec9c18fadf6b5cd71a7d4122776f5d4b8ac33 (patch) | |
| tree | 01b477f0ea027ab5908f332f6102db6a1d381b76 /source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | |
| parent | 5cdd4388ffaad5ade916dba3c18e2bc679e19747 (diff) | |
| parent | e3546a5097b1b30a3c694ce0f6b98c2f7e70510c (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-uv_toolssoc-2016-uv_tools
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) |