diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:16:13 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:22:35 +0300 |
| commit | a78b3ee53aa53020b086a6df25c0e28491223dcc (patch) | |
| tree | bd883e95580f5777f7eae7cac4e47f182ac9fc00 /source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp | |
| parent | 4842cc017c3bb7df2070c2f96605190ff88e6a2e (diff) | |
| parent | 49f4ac17bf704614de59a4db7a65c205c085d694 (diff) | |
Merge remote-tracking branch 'origin/master' into openvdbopenvdb
Diffstat (limited to 'source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp')
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp index fd3d713b3d2..1dee1de9de2 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp @@ -82,9 +82,11 @@ void SCA_Joystick::HandleEvents(void) { SDL_Event sdl_event; +#ifdef WITH_SDL_DYNLOAD if (SDL_PollEvent == (void*)0) { return; } +#endif int i; for (i=0; i<m_joynum; i++) { /* could use JOYINDEX_MAX but no reason to */ |