Mercurial > sdl-ios-xcode
diff src/video/bwindow/SDL_BWin.h @ 1361:19418e4422cb
New configure-based build system. Still work in progress, but much improved
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 16 Feb 2006 10:11:48 +0000 |
| parents | 3692456e7b0f |
| children | e440d5c488c1 |
line wrap: on
line diff
--- a/src/video/bwindow/SDL_BWin.h Fri Feb 10 07:29:08 2006 +0000 +++ b/src/video/bwindow/SDL_BWin.h Thu Feb 16 10:11:48 2006 +0000 @@ -27,7 +27,7 @@ #include <AppKit.h> #include <InterfaceKit.h> #include <be/game/DirectWindow.h> -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL #include <be/opengl/GLView.h> #endif #include <support/UTF8.h> @@ -37,7 +37,7 @@ #include "SDL_BView.h" extern "C" { -#include "SDL_events_c.h" +#include "../../events/SDL_events_c.h" }; class SDL_BWin : public BDirectWindow @@ -49,7 +49,7 @@ last_buttons = 0; the_view = NULL; -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL SDL_GLView = NULL; #endif SDL_View = NULL; @@ -61,7 +61,7 @@ virtual ~SDL_BWin() { Lock(); if ( the_view ) { -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { SDL_GLView->UnlockGL(); } @@ -70,7 +70,7 @@ the_view = NULL; } Unlock(); -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL if ( SDL_GLView ) { delete SDL_GLView; } @@ -218,7 +218,7 @@ retval = 0; Lock(); if ( flags & SDL_OPENGL ) { -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL if ( SDL_GLView == NULL ) { SDL_GLView = new BGLView(Bounds(), "SDL GLView", B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS), @@ -242,7 +242,7 @@ } if ( the_view != SDL_View ) { if ( the_view ) { -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { SDL_GLView->UnlockGL(); } @@ -260,7 +260,7 @@ SDL_View->SetBitmap(bitmap); } virtual void SetXYOffset(int x, int y) { -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { return; } @@ -268,7 +268,7 @@ SDL_View->SetXYOffset(x, y); } virtual void GetXYOffset(int &x, int &y) { -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL if ( the_view == SDL_GLView ) { x = 0; y = 0; @@ -287,7 +287,7 @@ SDL_View->Sync(); Unlock(); } -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL virtual void SwapBuffers(void) { SDL_GLView->UnlockGL(); SDL_GLView->LockGL(); @@ -540,7 +540,7 @@ } private: -#ifdef HAVE_OPENGL +#if SDL_VIDEO_OPENGL BGLView *SDL_GLView; #endif SDL_BView *SDL_View;