diff options
| -rw-r--r-- | backends/graphics/opengl/gltexture.h | 5 | ||||
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.h | 2 | ||||
| -rw-r--r-- | backends/graphics/sdl/sdl-graphics.cpp | 13 | ||||
| -rwxr-xr-x | configure | 3 |
4 files changed, 14 insertions, 9 deletions
diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h index 7a33c88098..9238b73cf4 100644 --- a/backends/graphics/opengl/gltexture.h +++ b/backends/graphics/opengl/gltexture.h @@ -32,9 +32,12 @@ #undef ARRAYSIZE #endif -#ifdef USE_GLES +#if defined(USE_GLES) #include <GLES/gl.h> #include <GLES/glext.h> +#elif defined(MACOSX) +#include <gl.h> +#include <glext.h> #else #include <GL/gl.h> #include <GL/glext.h> diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h index ef71028854..cbf81db9b0 100644 --- a/backends/graphics/opengl/opengl-graphics.h +++ b/backends/graphics/opengl/opengl-graphics.h @@ -30,7 +30,7 @@ #include "backends/graphics/graphics.h" enum { - GFX_NORMAL = 0, + GFX_NORMAL = 0 }; /** diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp index 26a5a6302c..a554479756 100644 --- a/backends/graphics/sdl/sdl-graphics.cpp +++ b/backends/graphics/sdl/sdl-graphics.cpp @@ -1994,20 +1994,21 @@ bool SdlGraphicsManager::handleScalerHotkeys(Common::KeyCode key) { int newMode = -1; int factor = _videoMode.scaleFactor - 1; + SDLKey sdlKey = (SDLKey)key; // Increase/decrease the scale factor - if (key == SDLK_EQUALS || key == SDLK_PLUS || key == SDLK_MINUS || - key == SDLK_KP_PLUS || key == SDLK_KP_MINUS) { - factor += (key == SDLK_MINUS || key == SDLK_KP_MINUS) ? -1 : +1; + if (sdlKey == SDLK_EQUALS || sdlKey == SDLK_PLUS || sdlKey == SDLK_MINUS || + sdlKey == SDLK_KP_PLUS || sdlKey == SDLK_KP_MINUS) { + factor += (sdlKey == SDLK_MINUS || sdlKey == SDLK_KP_MINUS) ? -1 : +1; if (0 <= factor && factor <= 3) { newMode = s_gfxModeSwitchTable[_scalerType][factor]; } } - const bool isNormalNumber = (SDLK_1 <= key && key <= SDLK_9); - const bool isKeypadNumber = (SDLK_KP1 <= key && key <= SDLK_KP9); + const bool isNormalNumber = (SDLK_1 <= sdlKey && sdlKey <= SDLK_9); + const bool isKeypadNumber = (SDLK_KP1 <= sdlKey && sdlKey <= SDLK_KP9); if (isNormalNumber || isKeypadNumber) { - _scalerType = key - (isNormalNumber ? SDLK_1 : SDLK_KP1); + _scalerType = sdlKey - (isNormalNumber ? SDLK_1 : SDLK_KP1); if (_scalerType >= ARRAYSIZE(s_gfxModeSwitchTable)) return false; @@ -1335,7 +1335,8 @@ case $_host_os in ;; darwin*) DEFINES="$DEFINES -DUNIX -DMACOSX" - LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI" + CXXFLAGS="$CXXFLAGS -I/System/Library/Frameworks/OpenGL.framework/Headers" + LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -framework OpenGL" add_line_to_config_mk 'MACOSX = 1' ;; dreamcast) |