[Bf-blender-cvs] [11204fce4e1] master: Fix strict compiler warning in BGE when linking directly to SDL

[Sergey Sharybin]

Commit: 11204fce4e19f273eea3e74a215823b7d9917c7a
Author: Sergey Sharybin
Date:   Fri Jul 21 16:07:59 2017 +0200
Branches: master
https://developer.blender.org/rB11204fce4e19f273eea3e74a215823b7d9917c7a

Fix strict compiler warning in BGE when linking directly to SDL

===================================================================

M	source/gameengine/GameLogic/CMakeLists.txt
M	source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
M	source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp

===================================================================

diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt
index 05071f59707..b9eec74f6f4 100644
--- a/source/gameengine/GameLogic/CMakeLists.txt
+++ b/source/gameengine/GameLogic/CMakeLists.txt
@@ -139,6 +139,9 @@ if(WITH_SDL)
 	if(WITH_GHOST_SDL)
 		add_definitions(-DWITH_GHOST_SDL)
 	endif()
+	if(WITH_SDL_DYNLOAD)
+		add_definitions(-DWITH_SDL_DYNLOAD)
+	endif()
 endif()
 
 blender_add_lib(ge_logic "${SRC}" "${INC}" "${INC_SYS}")
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)
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 */