summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-17 03:38:10 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-17 03:38:10 +0300
commitb3ee753a9386bc0c9e15eeea865c8f253a3bd6ee (patch)
tree24a043204c01e7e803e280c4c41d2e2601495b03 /src
parent8d32becc5b0fe645d1b8dc4245310ff35ebd8777 (diff)
downloadmv-b3ee753a9386bc0c9e15eeea865c8f253a3bd6ee.tar.gz
mv-b3ee753a9386bc0c9e15eeea865c8f253a3bd6ee.tar.bz2
mv-b3ee753a9386bc0c9e15eeea865c8f253a3bd6ee.tar.xz
mv-b3ee753a9386bc0c9e15eeea865c8f253a3bd6ee.zip
Fix unit tests compilation with SDl 1.2
Diffstat (limited to 'src')
-rw-r--r--src/gui/windowmanager_unittest.cc2
-rw-r--r--src/integrity_unittest.cc2
-rw-r--r--src/resources/dye/dyepalette_unittest.cc2
-rw-r--r--src/resources/sprite/animatedsprite_unittest.cc2
4 files changed, 0 insertions, 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"