From 48c665b22758053cdf8dc479c9c9d6daaa7a9352 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 18 Sep 2010 17:16:36 -0700 Subject: [PATCH] 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 --HG-- branch : SDL-1.2 --- src/main/beos/SDL_BeApp.cc | 6 ++++-- src/video/bwindow/SDL_sysvideo.cc | 1 - src/video/bwindow/SDL_sysyuv.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/beos/SDL_BeApp.cc b/src/main/beos/SDL_BeApp.cc index 0246a0958..9541ca9eb 100644 --- a/src/main/beos/SDL_BeApp.cc +++ b/src/main/beos/SDL_BeApp.cc @@ -39,13 +39,15 @@ static SDL_Thread *SDL_AppThread = NULL; 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 @@ int SDL_InitBeApp(void) ++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 */ diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc index 33597621a..491a097b1 100644 --- a/src/video/bwindow/SDL_sysvideo.cc +++ b/src/video/bwindow/SDL_sysvideo.cc @@ -57,7 +57,6 @@ static void BE_UnlockHWSurface(_THIS, SDL_Surface *surface); 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 diff --git a/src/video/bwindow/SDL_sysyuv.h b/src/video/bwindow/SDL_sysyuv.h index 6681d49fd..aafaa2707 100644 --- a/src/video/bwindow/SDL_sysyuv.h +++ b/src/video/bwindow/SDL_sysyuv.h @@ -62,7 +62,7 @@ struct private_yuvhwdata }; 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);