diff --git a/src/common/EventHandlerSDL2.hxx b/src/common/EventHandlerSDL2.hxx index 8ecc6f9ca..591d878c4 100644 --- a/src/common/EventHandlerSDL2.hxx +++ b/src/common/EventHandlerSDL2.hxx @@ -18,7 +18,7 @@ #ifndef EVENTHANDLER_SDL2_HXX #define EVENTHANDLER_SDL2_HXX -#include +#include "SDL_lib.hxx" #include "EventHandler.hxx" /** diff --git a/src/common/FrameBufferSDL2.cxx b/src/common/FrameBufferSDL2.cxx index ce5017210..4880d67c6 100644 --- a/src/common/FrameBufferSDL2.cxx +++ b/src/common/FrameBufferSDL2.cxx @@ -15,11 +15,11 @@ // this file, and for a DISCLAIMER OF ALL WARRANTIES. //============================================================================ -#include #include #include #include +#include "SDL_lib.hxx" #include "bspf.hxx" #include "Console.hxx" diff --git a/src/common/FrameBufferSDL2.hxx b/src/common/FrameBufferSDL2.hxx index 7bed5bc96..d06cb24ca 100644 --- a/src/common/FrameBufferSDL2.hxx +++ b/src/common/FrameBufferSDL2.hxx @@ -18,7 +18,7 @@ #ifndef FRAMEBUFFER_SDL2_HXX #define FRAMEBUFFER_SDL2_HXX -#include +#include "SDL_lib.hxx" class OSystem; class FBSurfaceSDL2; diff --git a/src/common/SDL_lib.hxx b/src/common/SDL_lib.hxx new file mode 100644 index 000000000..2981dfb95 --- /dev/null +++ b/src/common/SDL_lib.hxx @@ -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 +#undef bool // Seems to be needed for ppc64le, doesn't hurt other archs + +#endif diff --git a/src/common/SoundSDL2.cxx b/src/common/SoundSDL2.cxx index 7658d81fc..439f73b34 100644 --- a/src/common/SoundSDL2.cxx +++ b/src/common/SoundSDL2.cxx @@ -20,8 +20,8 @@ #include #include #include -#include +#include "SDL_lib.hxx" #include "TIASnd.hxx" #include "TIATypes.hxx" #include "FrameBuffer.hxx" diff --git a/src/common/SoundSDL2.hxx b/src/common/SoundSDL2.hxx index 6d6278523..5d186a5c1 100644 --- a/src/common/SoundSDL2.hxx +++ b/src/common/SoundSDL2.hxx @@ -22,7 +22,7 @@ class OSystem; -#include +#include "SDL_lib.hxx" #include "bspf.hxx" #include "TIASnd.hxx" diff --git a/src/common/StellaKeys.hxx b/src/common/StellaKeys.hxx index efe234970..b9e6dc9f8 100644 --- a/src/common/StellaKeys.hxx +++ b/src/common/StellaKeys.hxx @@ -18,7 +18,7 @@ #ifndef STELLA_KEYS_HXX #define STELLA_KEYS_HXX -#include +#include "SDL_lib.hxx" /** This class implements a thin wrapper around the SDL keysym enumerations,