From ec1beaa2ee07368368e9bd45fe400eedc57419eb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 21 Aug 2013 14:37:03 +0300 Subject: first part of fixes for compilation with SDL2 --- src/graphics.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/graphics.cpp') diff --git a/src/graphics.cpp b/src/graphics.cpp index 0b4e9be15..51c2c4a24 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -106,6 +106,11 @@ void Graphics::setMainFlags(const int w, const int h, const int bpp, int Graphics::getOpenGLFlags() const { #ifdef USE_OPENGL +#ifdef USE_SDL2 + int displayFlags = SDL_WINDOW_OPENGL; + if (mFullscreen) + displayFlags |= SDL_WINDOW_FULLSCREEN; +#else int displayFlags = SDL_ANYFORMAT | SDL_OPENGL; if (mFullscreen) @@ -126,6 +131,7 @@ int Graphics::getOpenGLFlags() const displayFlags |= SDL_NOFRAME; return displayFlags; +#endif #else return 0; #endif @@ -193,6 +199,12 @@ bool Graphics::setOpenGLMode() int Graphics::getSoftwareFlags() const { +#ifdef USE_SDL2 + int displayFlags = 0; + + if (mFullscreen) + displayFlags |= SDL_FULLSCREEN; +#else int displayFlags = SDL_ANYFORMAT; if (mFullscreen) @@ -207,7 +219,7 @@ int Graphics::getSoftwareFlags() const if (mNoFrame) displayFlags |= SDL_NOFRAME; - +#endif return displayFlags; } -- cgit v1.2.3-70-g09d2