summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am18
-rw-r--r--src/client.h5
-rw-r--r--src/resources/image.cpp4
-rw-r--r--src/sdl2gfx/SDL2_framerate.c (renamed from src/sdl2gfx/SDL_framerate.c)2
-rw-r--r--src/sdl2gfx/SDL2_framerate.h (renamed from src/sdl2gfx/SDL_framerate.h)0
-rw-r--r--src/sdl2gfx/SDL2_rotozoom.c (renamed from src/sdl2gfx/SDL_rotozoom.c)2
-rw-r--r--src/sdl2gfx/SDL2_rotozoom.h (renamed from src/sdl2gfx/SDL_rotozoom.h)0
7 files changed, 21 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 910ffb9e7..b62844381 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,17 +143,19 @@ manaplus_CXXFLAGS += -DENABLE_CHECKS
endif
if USE_SDL2
+if USE_INTERNALSDLGFX
dyecmd_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2
-dyecmd_SOURCES += sdl2gfx/SDL_framerate.c \
- sdl2gfx/SDL_framerate.h \
- sdl2gfx/SDL_rotozoom.c \
- sdl2gfx/SDL_rotozoom.h
+dyecmd_SOURCES += sdl2gfx/SDL2_framerate.c \
+ sdl2gfx/SDL2_framerate.h \
+ sdl2gfx/SDL2_rotozoom.c \
+ sdl2gfx/SDL2_rotozoom.h
manaplus_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2
-manaplus_SOURCES += sdl2gfx/SDL_framerate.c \
- sdl2gfx/SDL_framerate.h \
- sdl2gfx/SDL_rotozoom.c \
- sdl2gfx/SDL_rotozoom.h
+manaplus_SOURCES += sdl2gfx/SDL2_framerate.c \
+ sdl2gfx/SDL2_framerate.h \
+ sdl2gfx/SDL2_rotozoom.c \
+ sdl2gfx/SDL2_rotozoom.h
+endif
endif
if USE_INTERNALGUICHAN
diff --git a/src/client.h b/src/client.h
index f3b2bcc26..34f1227ae 100644
--- a/src/client.h
+++ b/src/client.h
@@ -30,7 +30,12 @@
#include <guichan/actionlistener.hpp>
#include <SDL.h>
+
+#ifdef USE_SDL2
+#include <SDL2_framerate.h>
+#else
#include <SDL_framerate.h>
+#endif
#include <string>
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index f185d103e..8bf41aa4c 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -33,7 +33,11 @@
#include "utils/sdlcheckutils.h"
+#ifdef USE_SDL2
+#include <SDL2_rotozoom.h>
+#else
#include <SDL_rotozoom.h>
+#endif
#include "debug.h"
diff --git a/src/sdl2gfx/SDL_framerate.c b/src/sdl2gfx/SDL2_framerate.c
index bb1c35fcb..b31b0feb2 100644
--- a/src/sdl2gfx/SDL_framerate.c
+++ b/src/sdl2gfx/SDL2_framerate.c
@@ -28,7 +28,7 @@ Andreas Schiffler -- aschiffler at ferzkopp dot net
Changed for ManaPlus (C) 2013 ManaPlus developers
*/
-#include "SDL_framerate.h"
+#include "SDL2_framerate.h"
/*!
\brief Internal wrapper to SDL_GetTicks that ensures a non-zero return value.
diff --git a/src/sdl2gfx/SDL_framerate.h b/src/sdl2gfx/SDL2_framerate.h
index a2e62e944..a2e62e944 100644
--- a/src/sdl2gfx/SDL_framerate.h
+++ b/src/sdl2gfx/SDL2_framerate.h
diff --git a/src/sdl2gfx/SDL_rotozoom.c b/src/sdl2gfx/SDL2_rotozoom.c
index 6313f4008..058074de1 100644
--- a/src/sdl2gfx/SDL_rotozoom.c
+++ b/src/sdl2gfx/SDL2_rotozoom.c
@@ -34,7 +34,7 @@ Andreas Schiffler -- aschiffler at ferzkopp dot net
#include <stdlib.h>
#include <string.h>
-#include "SDL_rotozoom.h"
+#include "SDL2_rotozoom.h"
/* ---- Internally used structures */
diff --git a/src/sdl2gfx/SDL_rotozoom.h b/src/sdl2gfx/SDL2_rotozoom.h
index f4c236ba4..f4c236ba4 100644
--- a/src/sdl2gfx/SDL_rotozoom.h
+++ b/src/sdl2gfx/SDL2_rotozoom.h