From c3bf69ca4bfeea5cada564d368bbc27c528e1093 Mon Sep 17 00:00:00 2001 From: Philipp Wiesemann Date: Fri, 7 Jul 2017 23:00:22 +0200 Subject: [PATCH] haiku: Fixed compiling without OpenGL support. --- src/main/haiku/SDL_BApp.h | 9 +++++++++ src/video/haiku/SDL_bopengl.cc | 4 ++-- src/video/haiku/SDL_bopengl.h | 4 ++++ src/video/haiku/SDL_bvideo.cc | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h index 871614bec..9b5ea0036 100644 --- a/src/main/haiku/SDL_BApp.h +++ b/src/main/haiku/SDL_BApp.h @@ -22,7 +22,9 @@ #define SDL_BAPP_H #include +#if SDL_VIDEO_OPENGL #include +#endif #include "../../video/haiku/SDL_bkeyboard.h" @@ -80,7 +82,9 @@ class SDL_BApp : public BApplication { public: SDL_BApp(const char* signature) : BApplication(signature) { +#if SDL_VIDEO_OPENGL _current_context = NULL; +#endif } @@ -188,6 +192,7 @@ public: return _window_map[winID]; } +#if SDL_VIDEO_OPENGL void SetCurrentContext(BGLView *newContext) { if(_current_context) _current_context->UnlockGL(); @@ -195,6 +200,8 @@ public: if (_current_context) _current_context->LockGL(); } +#endif + private: /* Event management */ void _HandleBasicWindowEvent(BMessage *msg, int32 sdlEventType) { @@ -384,7 +391,9 @@ private: /* Members */ std::vector _window_map; /* Keeps track of SDL_Windows by index-id */ +#if SDL_VIDEO_OPENGL BGLView *_current_context; +#endif }; #endif diff --git a/src/video/haiku/SDL_bopengl.cc b/src/video/haiku/SDL_bopengl.cc index 4cdb92b14..0a0000ead 100644 --- a/src/video/haiku/SDL_bopengl.cc +++ b/src/video/haiku/SDL_bopengl.cc @@ -20,7 +20,7 @@ */ #include "../../SDL_internal.h" -#if SDL_VIDEO_DRIVER_HAIKU +#if SDL_VIDEO_DRIVER_HAIKU && SDL_VIDEO_OPENGL #include "SDL_bopengl.h" @@ -171,6 +171,6 @@ void BE_GL_RebootContexts(_THIS) { } #endif -#endif /* SDL_VIDEO_DRIVER_HAIKU */ +#endif /* SDL_VIDEO_DRIVER_HAIKU && SDL_VIDEO_OPENGL */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/haiku/SDL_bopengl.h b/src/video/haiku/SDL_bopengl.h index 84edb659f..a8d234623 100644 --- a/src/video/haiku/SDL_bopengl.h +++ b/src/video/haiku/SDL_bopengl.h @@ -22,6 +22,8 @@ #ifndef SDL_BOPENGL_H #define SDL_BOPENGL_H +#if SDL_VIDEO_DRIVER_HAIKU && SDL_VIDEO_OPENGL + #ifdef __cplusplus extern "C" { #endif @@ -46,6 +48,8 @@ extern void BE_GL_RebootContexts(_THIS); } #endif +#endif /* SDL_VIDEO_DRIVER_HAIKU && SDL_VIDEO_OPENGL */ + #endif /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/haiku/SDL_bvideo.cc b/src/video/haiku/SDL_bvideo.cc index b67f61755..ef43c2ca4 100644 --- a/src/video/haiku/SDL_bvideo.cc +++ b/src/video/haiku/SDL_bvideo.cc @@ -96,7 +96,7 @@ BE_CreateDevice(int devindex) device->shape_driver.SetWindowShape = NULL; device->shape_driver.ResizeWindowShape = NULL; - +#if SDL_VIDEO_OPENGL device->GL_LoadLibrary = BE_GL_LoadLibrary; device->GL_GetProcAddress = BE_GL_GetProcAddress; device->GL_UnloadLibrary = BE_GL_UnloadLibrary; @@ -106,6 +106,7 @@ BE_CreateDevice(int devindex) device->GL_GetSwapInterval = BE_GL_GetSwapInterval; device->GL_SwapWindow = BE_GL_SwapWindow; device->GL_DeleteContext = BE_GL_DeleteContext; +#endif device->StartTextInput = BE_StartTextInput; device->StopTextInput = BE_StopTextInput;