Mercurial > sdl-ios-xcode
changeset 4888:46fb637777ed SDL-1.2
Here's the patch we use when building SDL-1.2.14 and 1.2-hg on Haiku,
it only affects Haiku specific files so should be ok to apply in hg.
-Scott McCreary
HaikuPorts
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 18 Sep 2010 17:16:36 -0700 |
| parents | 5002d6aeb85c |
| children | 0d4756e57224 |
| files | src/main/beos/SDL_BeApp.cc src/video/bwindow/SDL_sysvideo.cc src/video/bwindow/SDL_sysyuv.h |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/beos/SDL_BeApp.cc Fri Jul 09 17:19:18 2010 +0200 +++ b/src/main/beos/SDL_BeApp.cc Sat Sep 18 17:16:36 2010 -0700 @@ -39,13 +39,15 @@ static int StartBeApp(void *unused) { + if(!be_app) { BApplication *App; App = new BApplication("application/x-SDL-executable"); App->Run(); delete App; - return(0); + } + return(0); } /* Initialize the Be Application, if it's not already started */ @@ -86,7 +88,7 @@ ++SDL_BeAppActive; /* The app is running, and we're ready to go */ - return(0); + return(0); } /* Quit the Be Application, if there's nothing left to do */
--- a/src/video/bwindow/SDL_sysvideo.cc Fri Jul 09 17:19:18 2010 +0200 +++ b/src/video/bwindow/SDL_sysvideo.cc Sat Sep 18 17:16:36 2010 -0700 @@ -57,7 +57,6 @@ static void BE_FreeHWSurface(_THIS, SDL_Surface *surface); static int BE_ToggleFullScreen(_THIS, int fullscreen); -static SDL_Overlay *BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface *display); /* OpenGL functions */ #if SDL_VIDEO_OPENGL
--- a/src/video/bwindow/SDL_sysyuv.h Fri Jul 09 17:19:18 2010 +0200 +++ b/src/video/bwindow/SDL_sysyuv.h Sat Sep 18 17:16:36 2010 -0700 @@ -62,7 +62,7 @@ }; extern BBitmap * BE_GetOverlayBitmap(BRect bounds, color_space cs); -SDL_Overlay* BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display); +extern SDL_Overlay* BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display); extern int BE_LockYUVOverlay(_THIS, SDL_Overlay* overlay); extern void BE_UnlockYUVOverlay(_THIS, SDL_Overlay* overlay); extern int BE_DisplayYUVOverlay(_THIS, SDL_Overlay* overlay, SDL_Rect* src, SDL_Rect* dst);