From b3ee753a9386bc0c9e15eeea865c8f253a3bd6ee Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Feb 2016 03:38:10 +0300 Subject: Fix unit tests compilation with SDl 1.2 --- src/gui/windowmanager_unittest.cc | 2 -- src/integrity_unittest.cc | 2 -- src/resources/dye/dyepalette_unittest.cc | 2 -- src/resources/sprite/animatedsprite_unittest.cc | 2 -- 4 files changed, 8 deletions(-) diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 7d18c4b9a..b684bb998 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -20,9 +20,7 @@ #include "catch.hpp" #include "client.h" -#ifdef USE_SDL2 #include "graphicsmanager.h" -#endif #include "settings.h" #include "gui/gui.h" diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index c24452ae2..cc8a79c1d 100644 --- a/src/integrity_unittest.cc +++ b/src/integrity_unittest.cc @@ -23,9 +23,7 @@ #include "catch.hpp" #include "client.h" #include "logger.h" -#ifdef USE_SDL2 #include "graphicsmanager.h" -#endif #include "input/inputactionmap.h" #include "input/inputmanager.h" diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index d250acb39..cda902697 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -23,9 +23,7 @@ #include "client.h" #include "configuration.h" #include "logger.h" -#ifdef USE_SDL2 #include "graphicsmanager.h" -#endif #include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index e87586466..715ce76b8 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -22,9 +22,7 @@ #include "catch.hpp" #include "client.h" -#ifdef USE_SDL2 #include "graphicsmanager.h" -#endif #include "const/resources/spriteaction.h" -- cgit v1.2.3-70-g09d2