Lots of fixes importing SDL source wholesale into a new iOS project

--HG--
rename : src/libm/math.h => src/libm/math_libm.h

src/video/directfb/SDL_DirectFB_WM.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
 
 #include "SDL_DirectFB_video.h"
 #include "SDL_DirectFB_window.h"
@@ -407,3 +410,4 @@ DirectFB_WM_ProcessEvent(_THIS, SDL_Window * window, DFBWindowEvent * evt)
     return 0;
 }
 
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */

src/video/directfb/SDL_DirectFB_dyn.c

@@ -18,9 +18,10 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "SDL_config.h"
 
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
 #include "SDL_DirectFB_video.h"
 #include "SDL_DirectFB_dyn.h"
 
@@ -112,3 +113,5 @@ SDL_DirectFB_UnLoadLibrary(void)
 {
 }
 #endif
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */

src/video/directfb/SDL_DirectFB_events.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
 
 /* Handle the event stream, converting DirectFB input events into SDL events */
 
@@ -743,3 +746,4 @@ DirectFB_QuitKeyboard(_THIS)
 
 }
 
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */

src/video/directfb/SDL_DirectFB_modes.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
 
 #include "SDL_DirectFB_video.h"
 #include "SDL_DirectFB_modes.h"
@@ -406,4 +409,6 @@ DirectFB_QuitModes(_THIS)
     }
 }
 
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/video/directfb/SDL_DirectFB_mouse.c

@@ -18,8 +18,10 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
 #include "SDL_assert.h"
 
 #include "SDL_DirectFB_video.h"
@@ -387,4 +389,6 @@ DirectFB_QuitMouse(_THIS)
 
 #endif
 
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/video/directfb/SDL_DirectFB_opengl.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
 
 #include "SDL_DirectFB_video.h"
 
@@ -352,4 +355,6 @@ DirectFB_GL_DestroyWindowContexts(_THIS, SDL_Window * window)
 
 #endif
 
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/video/directfb/SDL_DirectFB_render.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
 //#include "SDL_DirectFB_video.h"
 #include "SDL_DirectFB_window.h"
 #include "SDL_DirectFB_modes.h"
@@ -1255,4 +1258,6 @@ DirectFB_RenderWritePixels(SDL_Renderer * renderer, const SDL_Rect * rect,
 }
 #endif
 
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/video/directfb/SDL_DirectFB_shape.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
 
 #include "SDL_assert.h"
 #include "SDL_DirectFB_video.h"
@@ -128,3 +131,4 @@ error:
 	return -1;
 }
 
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */

src/video/directfb/SDL_DirectFB_video.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
 
 #include "SDL_DirectFB_video.h"
 
@@ -416,3 +419,5 @@ void DirectFB_SetSupportedPixelFormats(SDL_RendererInfo* ri)
     		ri->texture_formats[j++] = pixelformat_tab[i].sdl;
     ri->num_texture_formats = j;
 }
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */

src/video/directfb/SDL_DirectFB_window.c

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_config.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
 
 #include "SDL_DirectFB_video.h"
 #include "SDL_DirectFB_modes.h"
@@ -520,3 +523,5 @@ DirectFB_AdjustWindowSurface(SDL_Window * window)
   error:
     return;
 }
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */