Renamed SDL_iPhoneGetViewFramebuffer/Renderbuffer to SDL_iOSGetViewFramebuffer/Renderbuffer. Added #defines for SDL_iOSSetAnimationCallback and SDL_iOSSetEventPump, which point to SDL_iPhoneSetAnimationCallback and SDL_iPhoneSetEventPump. iOS-improvements
authorAlex Szpakowski <slime73@gmail.com>
Wed, 08 Apr 2015 15:59:29 -0300
branchiOS-improvements
changeset 9539 ea3513fe64a0
parent 9538 3f4340777b65
child 9540 32ddc92d78cf
Renamed SDL_iPhoneGetViewFramebuffer/Renderbuffer to SDL_iOSGetViewFramebuffer/Renderbuffer. Added #defines for SDL_iOSSetAnimationCallback and SDL_iOSSetEventPump, which point to SDL_iPhoneSetAnimationCallback and SDL_iPhoneSetEventPump.
include/SDL_system.h
src/dynapi/SDL_dynapi_overrides.h
src/dynapi/SDL_dynapi_procs.h
src/video/uikit/SDL_uikitopengles.m
--- a/include/SDL_system.h	Wed Apr 08 15:44:07 2015 -0300
+++ b/include/SDL_system.h	Wed Apr 08 15:59:29 2015 -0300
@@ -73,7 +73,10 @@
 /* Platform specific functions for iOS */
 #if defined(__IPHONEOS__) && __IPHONEOS__
 
+#define SDL_iOSSetAnimationCallback(window, interval, callback, callbackParam) SDL_iPhoneSetAnimationCallback(window, interval, callback, callbackParam)
 extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
+
+#define SDL_iOSSetEventPump(enabled) SDL_iPhoneSetEventPump(enabled)
 extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
 
 /**
@@ -81,14 +84,14 @@
 
    The Renderbuffer must be bound when calling SDL_GL_SwapWindow.
  */
-extern DECLSPEC Uint32 SDLCALL SDL_iPhoneGetViewRenderbuffer(SDL_Window * window);
+extern DECLSPEC Uint32 SDLCALL SDL_iOSGetViewRenderbuffer(SDL_Window * window);
 
 /**
    \brief Returns the OpenGL Framebuffer Object associated with the window's main view.
 
    The Framebuffer must be bound when rendering to the screen.
  */
-extern DECLSPEC Uint32 SDLCALL SDL_iPhoneGetViewFramebuffer(SDL_Window * window);
+extern DECLSPEC Uint32 SDLCALL SDL_iOSGetViewFramebuffer(SDL_Window * window);
 
 #endif /* __IPHONEOS__ */
 
--- a/src/dynapi/SDL_dynapi_overrides.h	Wed Apr 08 15:44:07 2015 -0300
+++ b/src/dynapi/SDL_dynapi_overrides.h	Wed Apr 08 15:59:29 2015 -0300
@@ -592,5 +592,5 @@
 #define SDL_GetQueuedAudioSize SDL_GetQueuedAudioSize_REAL
 #define SDL_ClearQueuedAudio SDL_ClearQueuedAudio_REAL
 #define SDL_GetGrabbedWindow SDL_GetGrabbedWindow_REAL
-#define SDL_iPhoneGetViewRenderbuffer SDL_iPhoneGetViewRenderbuffer_REAL
-#define SDL_iPhoneGetViewFramebuffer SDL_iPhoneGetViewFramebuffer_REAL
+#define SDL_iOSGetViewRenderbuffer SDL_iOSGetViewRenderbuffer_REAL
+#define SDL_iOSGetViewFramebuffer SDL_iOSGetViewFramebuffer_REAL
--- a/src/dynapi/SDL_dynapi_procs.h	Wed Apr 08 15:44:07 2015 -0300
+++ b/src/dynapi/SDL_dynapi_procs.h	Wed Apr 08 15:59:29 2015 -0300
@@ -624,5 +624,7 @@
 SDL_DYNAPI_PROC(Uint32,SDL_GetQueuedAudioSize,(SDL_AudioDeviceID a),(a),return)
 SDL_DYNAPI_PROC(void,SDL_ClearQueuedAudio,(SDL_AudioDeviceID a),(a),)
 SDL_DYNAPI_PROC(SDL_Window*,SDL_GetGrabbedWindow,(void),(),return)
-SDL_DYNAPI_PROC(Uint32,SDL_iPhoneGetViewRenderbuffer,(SDL_Window *a),(a),return)
-SDL_DYNAPI_PROC(Uint32,SDL_iPhoneGetViewFramebuffer,(SDL_Window *a),(a),return)
+#if defined(__IPHONEOS__) && __IPHONEOS__
+SDL_DYNAPI_PROC(Uint32,SDL_iOSGetViewRenderbuffer,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(Uint32,SDL_iOSGetViewFramebuffer,(SDL_Window *a),(a),return)
+#endif
--- a/src/video/uikit/SDL_uikitopengles.m	Wed Apr 08 15:44:07 2015 -0300
+++ b/src/video/uikit/SDL_uikitopengles.m	Wed Apr 08 15:59:29 2015 -0300
@@ -184,7 +184,7 @@
 }
 
 Uint32
-SDL_iPhoneGetViewRenderbuffer(SDL_Window * window)
+SDL_iOSGetViewRenderbuffer(SDL_Window * window)
 {
     if (!window) {
         SDL_SetError("Invalid window");
@@ -205,7 +205,7 @@
 }
 
 Uint32
-SDL_iPhoneGetViewFramebuffer(SDL_Window * window)
+SDL_iOSGetViewFramebuffer(SDL_Window * window)
 {
     if (!window) {
         SDL_SetError("Invalid window");