ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some compilation fixes for GP2X cross-compiled under Linux using 

pre-compiled SDL libs.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1000 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-02-05 19:59:22 +00:00
parent cc07a7e502
commit 7532bbcd46
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
stella/src/common/FrameBufferSoft.cxx
View File

@ -13,11 +13,10 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: FrameBufferSoft.cxx,v 1.45 2006-01-20 20:07:25 stephena Exp $ // $Id: FrameBufferSoft.cxx,v 1.46 2006-02-05 19:59:22 stephena Exp $
//============================================================================ //============================================================================
#include <SDL.h> #include <SDL.h>
#include <SDL_syswm.h>
#include <sstream> #include <sstream>
#include "Console.hxx" #include "Console.hxx"

5
stella/src/common/FrameBufferSoft.hxx
View File

@ -13,14 +13,13 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: FrameBufferSoft.hxx,v 1.31 2006-01-19 00:45:12 stephena Exp $ // $Id: FrameBufferSoft.hxx,v 1.32 2006-02-05 19:59:22 stephena Exp $
//============================================================================ //============================================================================
#ifndef FRAMEBUFFER_SOFT_HXX #ifndef FRAMEBUFFER_SOFT_HXX
#define FRAMEBUFFER_SOFT_HXX #define FRAMEBUFFER_SOFT_HXX
#include <SDL.h> #include <SDL.h>
#include <SDL_syswm.h>
class OSystem; class OSystem;
class GUI::Font; class GUI::Font;
@ -35,7 +34,7 @@ class RectList;
This class implements an SDL software framebuffer. This class implements an SDL software framebuffer.
@author Stephen Anthony @author Stephen Anthony
@version $Id: FrameBufferSoft.hxx,v 1.31 2006-01-19 00:45:12 stephena Exp $ @version $Id: FrameBufferSoft.hxx,v 1.32 2006-02-05 19:59:22 stephena Exp $
*/ */
class FrameBufferSoft : public FrameBuffer class FrameBufferSoft : public FrameBuffer
{ {

5
stella/src/emucore/MediaFactory.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: MediaFactory.cxx,v 1.3 2006-01-19 00:45:12 stephena Exp $ // $Id: MediaFactory.cxx,v 1.4 2006-02-05 19:59:22 stephena Exp $
//============================================================================ //============================================================================
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -50,11 +50,10 @@
FrameBuffer* MediaFactory::createVideo(OSystem* osystem) FrameBuffer* MediaFactory::createVideo(OSystem* osystem)
{ {
FrameBuffer* fb = (FrameBuffer*) NULL; FrameBuffer* fb = (FrameBuffer*) NULL;
const string& type = osystem->settings().getString("video");
// OpenGL mode *may* fail, so we check for it first // OpenGL mode *may* fail, so we check for it first
#ifdef DISPLAY_OPENGL #ifdef DISPLAY_OPENGL
if(type == "gl") if(osystem->settings().getString("video") == "gl")
{ {
const string& gl_lib = osystem->settings().getString("gl_lib"); const string& gl_lib = osystem->settings().getString("gl_lib");
if(FrameBufferGL::loadFuncs(gl_lib)) if(FrameBufferGL::loadFuncs(gl_lib))