libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-14 16:07:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compile on Mac OS X.

Browse Source 
svn-id: r50801
This commit is contained in:
Matthew Hoops 2010-07-11 16:11:28 +00:00
parent 4dca7c7e02
commit a1161feed2
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backends/graphics/opengl/gltexture.h
View File

@ -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>

2
backends/graphics/opengl/opengl-graphics.h
View File

@ -30,7 +30,7 @@
#include "backends/graphics/graphics.h"
enum {
GFX_NORMAL = 0,
GFX_NORMAL = 0
};
/**

13
backends/graphics/sdl/sdl-graphics.cpp
View File

@ -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;

3
configure vendored
View File

@ -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)