piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

scon fixes SDL compiles

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1525 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-13 23:19:56 +00:00
parent 2c66b9d36f
commit bb817fbced
4 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -542,9 +542,14 @@ void OpenGL_Update()
{
#if USE_SDL
SDL_Surface *surface = SDL_GetVideoSurface();
RECT rcWindow;
if (!surface) return;
nBackbufferWidth = surface->w;
nBackbufferHeight = surface->h;
rcWindow.right = surface->w;
rcWindow.bottom = surface->h;
#elif defined(HAVE_COCOA) && HAVE_COCOA
RECT rcWindow;
rcWindow.right = GLWin.width;

2
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -41,6 +41,8 @@
#elif defined(HAVE_X11) && HAVE_X11
#define I_NEED_OS2_H // HAXXOR
#include <GL/glxew.h>
#elif defined(USE_SDL) && USE_SDL
#include <GL/glew.h>
#elif defined(HAVE_COCOA) && HAVE_COCOA
#include <GL/glew.h>
#include "cocoaGL.h"

17
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -95,17 +95,14 @@ conf.Define('HAVE_XXF86VM', gfxenv['HAVE_XXF86VM'])
conf.Finish()
# change to True if you want to compile with SDL
useSDL = not ((gfxenv['HAVE_X11'] and gfxenv['HAVE_XXF86VM'])
or gfxenv['HAVE_COCOA'])
# Sanity check
if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']:
print "Must have wx to use wxgl"
Return()
if useSDL and not gfxenv['HAVE_SDL']:
print name + " must have either X11 or sdl to be build"
Return()
if useSDL:
compileFlags += [ '-DUSE_SDL=1' ]
if gfxenv['USE_SDL'] and not gfxenv['HAVE_SDL']:
print "Must have sdl to use SDL gl"
Return()
gfxenv.Append(
CXXFLAGS = compileFlags,