summaryrefslogtreecommitdiff
path: root/src/resources/dye
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-17 02:48:17 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-17 02:48:17 +0300
commit8d32becc5b0fe645d1b8dc4245310ff35ebd8777 (patch)
tree26b25e949a6a787c8d85e452545e3a8bfa70de06 /src/resources/dye
parent23f8cc7c1db313710180c0b1864a93cc76d2492d (diff)
downloadplus-8d32becc5b0fe645d1b8dc4245310ff35ebd8777.tar.gz
plus-8d32becc5b0fe645d1b8dc4245310ff35ebd8777.tar.bz2
plus-8d32becc5b0fe645d1b8dc4245310ff35ebd8777.tar.xz
plus-8d32becc5b0fe645d1b8dc4245310ff35ebd8777.zip
Fix unit tests if build with SDL2 support.
Diffstat (limited to 'src/resources/dye')
-rw-r--r--src/resources/dye/dyepalette_unittest.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc
index 1393070ea..d250acb39 100644
--- a/src/resources/dye/dyepalette_unittest.cc
+++ b/src/resources/dye/dyepalette_unittest.cc
@@ -23,6 +23,9 @@
#include "client.h"
#include "configuration.h"
#include "logger.h"
+#ifdef USE_SDL2
+#include "graphicsmanager.h"
+#endif
#include "resources/resourcemanager.h"
#include "resources/sdlimagehelper.h"
@@ -52,7 +55,13 @@ TEST_CASE("DyePalette tests")
resourceManager->addToSearchPath("../data/test", Append_false);
imageHelper = new SDLImageHelper();
- SDL_SetVideoMode(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+#ifdef USE_SDL2
+ SDLImageHelper::setRenderer(graphicsManager.createRenderer(
+ graphicsManager.createWindow(640, 480, 0,
+ SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE));
+#else
+ graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
+#endif
paths.setDefaultValues(getPathsDefaults());
PaletteDB::load();