From e7062838351fc67ab63a4780a25365dac4115005 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 20 Jun 2017 18:54:43 +0300 Subject: Fix compilation with SDL2. --- src/resources/sdlimagehelper_unittest.cc | 2 +- src/sdl2gfx/SDL2_framerate.h | 2 ++ src/sdl2gfx/SDL2_rotozoom.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/resources/sdlimagehelper_unittest.cc b/src/resources/sdlimagehelper_unittest.cc index a71c6a21f..517054b1b 100644 --- a/src/resources/sdlimagehelper_unittest.cc +++ b/src/resources/sdlimagehelper_unittest.cc @@ -19,6 +19,7 @@ */ #ifndef USE_SDL2 +#include "localconsts.h" PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") #include @@ -41,7 +42,6 @@ PRAGMA48(GCC diagnostic pop) #include "resources/sdlimagehelper.h" - #include "debug.h" static SDL_Surface *createSoftware32BitSurface(int width, diff --git a/src/sdl2gfx/SDL2_framerate.h b/src/sdl2gfx/SDL2_framerate.h index 271c4b986..4361b1f60 100644 --- a/src/sdl2gfx/SDL2_framerate.h +++ b/src/sdl2gfx/SDL2_framerate.h @@ -38,6 +38,8 @@ extern "C" /* --- */ +#include "localconsts.h" + PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") #include diff --git a/src/sdl2gfx/SDL2_rotozoom.h b/src/sdl2gfx/SDL2_rotozoom.h index 07587c58c..3ae52888e 100644 --- a/src/sdl2gfx/SDL2_rotozoom.h +++ b/src/sdl2gfx/SDL2_rotozoom.h @@ -42,6 +42,8 @@ extern "C" #define M_PI 3.1415926535897932384626433832795 #endif +#include "localconsts.h" + PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") #include -- cgit v1.2.3-70-g09d2