Potential fix for compile failure on ppc64le / SDL2.

This commit is contained in:
Stephen Anthony 2017-04-20 15:21:55 -02:30
parent 1dd8c04f68
commit 38deb5b1cf
7 changed files with 30 additions and 6 deletions

View File

@ -18,7 +18,7 @@
#ifndef EVENTHANDLER_SDL2_HXX #ifndef EVENTHANDLER_SDL2_HXX
#define EVENTHANDLER_SDL2_HXX #define EVENTHANDLER_SDL2_HXX
#include <SDL.h> #include "SDL_lib.hxx"
#include "EventHandler.hxx" #include "EventHandler.hxx"
/** /**

View File

@ -15,11 +15,11 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================ //============================================================================
#include <SDL.h>
#include <sstream> #include <sstream>
#include <time.h> #include <time.h>
#include <fstream> #include <fstream>
#include "SDL_lib.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "Console.hxx" #include "Console.hxx"

View File

@ -18,7 +18,7 @@
#ifndef FRAMEBUFFER_SDL2_HXX #ifndef FRAMEBUFFER_SDL2_HXX
#define FRAMEBUFFER_SDL2_HXX #define FRAMEBUFFER_SDL2_HXX
#include <SDL.h> #include "SDL_lib.hxx"
class OSystem; class OSystem;
class FBSurfaceSDL2; class FBSurfaceSDL2;

24
src/common/SDL_lib.hxx Normal file
View File

@ -0,0 +1,24 @@
//============================================================================
//
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
// Copyright (c) 1995-2017 by Bradford W. Mott, Stephen Anthony
// and the Stella Team
//
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#ifndef SDL_LIB_HXX
#define SDL_LIB_HXX
#include <SDL.h>
#undef bool // Seems to be needed for ppc64le, doesn't hurt other archs
#endif

View File

@ -20,8 +20,8 @@
#include <sstream> #include <sstream>
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
#include <SDL.h>
#include "SDL_lib.hxx"
#include "TIASnd.hxx" #include "TIASnd.hxx"
#include "TIATypes.hxx" #include "TIATypes.hxx"
#include "FrameBuffer.hxx" #include "FrameBuffer.hxx"

View File

@ -22,7 +22,7 @@
class OSystem; class OSystem;
#include <SDL.h> #include "SDL_lib.hxx"
#include "bspf.hxx" #include "bspf.hxx"
#include "TIASnd.hxx" #include "TIASnd.hxx"

View File

@ -18,7 +18,7 @@
#ifndef STELLA_KEYS_HXX #ifndef STELLA_KEYS_HXX
#define STELLA_KEYS_HXX #define STELLA_KEYS_HXX
#include <SDL.h> #include "SDL_lib.hxx"
/** /**
This class implements a thin wrapper around the SDL keysym enumerations, This class implements a thin wrapper around the SDL keysym enumerations,