mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
diff -r 5002d6aeb85c libsdl-1.2-hg/include/begin_code.h
|
|
--- libsdl-1.2-hg/include/begin_code.h Fri Jul 09 17:19:18 2010 +0200
|
|
+++ libsdl-1.2-hg-haiku/include/begin_code.h Fri Sep 17 14:58:26 2010 +0000
|
|
@@ -43,7 +43,7 @@
|
|
#ifndef DECLSPEC
|
|
# if defined(__BEOS__) || defined(__HAIKU__)
|
|
# if defined(__GNUC__)
|
|
-# define DECLSPEC __declspec(dllexport)
|
|
+# define DECLSPEC
|
|
# else
|
|
# define DECLSPEC __declspec(export)
|
|
# endif
|
|
diff -r 5002d6aeb85c libsdl-1.2-hg/src/main/beos/SDL_BeApp.cc
|
|
--- libsdl-1.2-hg/src/main/beos/SDL_BeApp.cc Fri Jul 09 17:19:18 2010 +0200
|
|
+++ libsdl-1.2-hg-haiku/src/main/beos/SDL_BeApp.cc Fri Sep 17 14:58:26 2010 +0000
|
|
@@ -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 */
|
|
diff -r 5002d6aeb85c libsdl-1.2-hg/src/video/bwindow/SDL_sysvideo.cc
|
|
--- libsdl-1.2-hg/src/video/bwindow/SDL_sysvideo.cc Fri Jul 09 17:19:18 2010 +0200
|
|
+++ libsdl-1.2-hg-haiku/src/video/bwindow/SDL_sysvideo.cc Fri Sep 17 14:58:26 2010 +0000
|
|
@@ -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
|
|
diff -r 5002d6aeb85c libsdl-1.2-hg/src/video/bwindow/SDL_sysyuv.h
|
|
--- libsdl-1.2-hg/src/video/bwindow/SDL_sysyuv.h Fri Jul 09 17:19:18 2010 +0200
|
|
+++ libsdl-1.2-hg-haiku/src/video/bwindow/SDL_sysyuv.h Fri Sep 17 14:58:26 2010 +0000
|
|
@@ -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);
|