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
This commit is contained in:
Sam Lantinga 2010-09-18 17:16:36 -07:00
parent 217991f8b4
commit 48c665b227
3 changed files with 5 additions and 4 deletions

View file

@ -39,12 +39,14 @@ static SDL_Thread *SDL_AppThread = NULL;
static int StartBeApp(void *unused) static int StartBeApp(void *unused)
{ {
if(!be_app) {
BApplication *App; BApplication *App;
App = new BApplication("application/x-SDL-executable"); App = new BApplication("application/x-SDL-executable");
App->Run(); App->Run();
delete App; delete App;
}
return(0); return(0);
} }

View file

@ -57,7 +57,6 @@ static void BE_UnlockHWSurface(_THIS, SDL_Surface *surface);
static void BE_FreeHWSurface(_THIS, SDL_Surface *surface); static void BE_FreeHWSurface(_THIS, SDL_Surface *surface);
static int BE_ToggleFullScreen(_THIS, int fullscreen); static int BE_ToggleFullScreen(_THIS, int fullscreen);
static SDL_Overlay *BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface *display);
/* OpenGL functions */ /* OpenGL functions */
#if SDL_VIDEO_OPENGL #if SDL_VIDEO_OPENGL

View file

@ -62,7 +62,7 @@ struct private_yuvhwdata
}; };
extern BBitmap * BE_GetOverlayBitmap(BRect bounds, color_space cs); 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 int BE_LockYUVOverlay(_THIS, SDL_Overlay* overlay);
extern void BE_UnlockYUVOverlay(_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); extern int BE_DisplayYUVOverlay(_THIS, SDL_Overlay* overlay, SDL_Rect* src, SDL_Rect* dst);