summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-06-03 21:28:49 +0300
committerAndrei Karas <akaras@inbox.ru>2013-06-03 21:28:49 +0300
commit8315c94fde36046785cf86165021906a49c6d849 (patch)
tree4b5e8ac7263b2fca078da5f1de30df77755924ef /src/resources
parent88e2d16c070f480e1892044f329cd38df298003d (diff)
downloadmanaplus-8315c94fde36046785cf86165021906a49c6d849.tar.gz
manaplus-8315c94fde36046785cf86165021906a49c6d849.tar.bz2
manaplus-8315c94fde36046785cf86165021906a49c6d849.tar.xz
manaplus-8315c94fde36046785cf86165021906a49c6d849.zip
Remove subdir SDL from SDL includes.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/atlasmanager.h2
-rw-r--r--src/resources/dyecolor.h2
-rw-r--r--src/resources/fboinfo.h2
-rw-r--r--src/resources/image.cpp4
-rw-r--r--src/resources/image.h4
-rw-r--r--src/resources/imagehelper.cpp4
-rw-r--r--src/resources/imagehelper.h2
-rw-r--r--src/resources/imagewriter.cpp2
-rw-r--r--src/resources/openglimagehelper.cpp4
-rw-r--r--src/resources/openglimagehelper.h4
-rw-r--r--src/resources/resourcemanager.cpp2
-rw-r--r--src/resources/sdlimagehelper.cpp4
-rw-r--r--src/resources/sdlimagehelper.h2
-rw-r--r--src/resources/sdlmusic.h2
-rw-r--r--src/resources/soundeffect.h2
-rw-r--r--src/resources/subimage.h4
16 files changed, 23 insertions, 23 deletions
diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h
index ac53a1a54..8b2baef17 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlasmanager.h
@@ -27,7 +27,7 @@
#include "utils/stringvector.h"
-#include <SDL/SDL.h>
+#include <SDL.h>
class Resource;
diff --git a/src/resources/dyecolor.h b/src/resources/dyecolor.h
index 0bade48f6..e9a6a5950 100644
--- a/src/resources/dyecolor.h
+++ b/src/resources/dyecolor.h
@@ -21,7 +21,7 @@
#ifndef RESOURCES_DYECOLOR_H
#define RESOURCES_DYECOLOR_H
-#include <SDL/SDL_stdinc.h>
+#include <SDL_stdinc.h>
#include "localconsts.h"
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h
index 94bad8d15..20fef77e3 100644
--- a/src/resources/fboinfo.h
+++ b/src/resources/fboinfo.h
@@ -32,7 +32,7 @@
#include <GLES/gl.h>
#include <GLES/glext.h>
#else
-#include <SDL/SDL_opengl.h>
+#include <SDL_opengl.h>
#include <GL/glext.h>
#endif
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 5896f1081..88360c870 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -39,8 +39,8 @@
#include "resources/sdlimagehelper.h"
#include "resources/subimage.h"
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL_image.h>
+#include <SDL_rotozoom.h>
#include "debug.h"
diff --git a/src/resources/image.h b/src/resources/image.h
index a49d7efff..78eb07d7f 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -28,7 +28,7 @@
#include "resources/resource.h"
-#include <SDL/SDL.h>
+#include <SDL.h>
#ifdef USE_OPENGL
@@ -36,7 +36,7 @@
#include <GLES/gl.h>
#else
#define GL_GLEXT_PROTOTYPES 1
-#include <SDL/SDL_opengl.h>
+#include <SDL_opengl.h>
#endif
#endif
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index efc4bfb59..6a4a47505 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -31,8 +31,8 @@
#include "resources/image.h"
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL_image.h>
+#include <SDL_rotozoom.h>
#include "debug.h"
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h
index 8044cc569..cf01a3f1e 100644
--- a/src/resources/imagehelper.h
+++ b/src/resources/imagehelper.h
@@ -27,7 +27,7 @@
#include "resources/resource.h"
-#include <SDL/SDL.h>
+#include <SDL.h>
class Dye;
class Image;
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 9c7765d18..ef0b48dc2 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -25,7 +25,7 @@
#include "logger.h"
#include <png.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include <string>
#include "debug.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index f0c165d5d..a107b0099 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -39,8 +39,8 @@
#include "utils/stringutils.h"
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL_image.h>
+#include <SDL_rotozoom.h>
#include "debug.h"
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 85a094fd3..e19c5e735 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -37,14 +37,14 @@
#include "resources/imagehelper.h"
-#include <SDL/SDL.h>
+#include <SDL.h>
#ifdef ANDROID
#include <GLES/gl.h>
#define GL_RGBA8 GL_RGBA8_OES
#else
#define GL_GLEXT_PROTOTYPES 1
-#include <SDL/SDL_opengl.h>
+#include <SDL_opengl.h>
#endif
class Dye;
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 789d84573..83beb8e9c 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -43,7 +43,7 @@
#include "utils/mkdir.h"
#include "utils/physfsrwops.h"
-#include <SDL/SDL_image.h>
+#include <SDL_image.h>
#include <cassert>
#include <dirent.h>
#include <fstream>
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index ad62cec54..881368fd3 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -31,8 +31,8 @@
#include "resources/image.h"
-#include <SDL/SDL_image.h>
-#include <SDL/SDL_rotozoom.h>
+#include <SDL_image.h>
+#include <SDL_rotozoom.h>
#include "debug.h"
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index fbc6c4451..291345164 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -27,7 +27,7 @@
#include "resources/imagehelper.h"
-#include <SDL/SDL.h>
+#include <SDL.h>
class Dye;
class Image;
diff --git a/src/resources/sdlmusic.h b/src/resources/sdlmusic.h
index da092c1a6..05a5528b7 100644
--- a/src/resources/sdlmusic.h
+++ b/src/resources/sdlmusic.h
@@ -25,7 +25,7 @@
#include "resources/resource.h"
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
#include "localconsts.h"
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index f9fbfa6a1..3b6724820 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -25,7 +25,7 @@
#include "resources/resource.h"
-#include <SDL/SDL_mixer.h>
+#include <SDL_mixer.h>
#include "localconsts.h"
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 292fbdc0f..8dae594f6 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -26,7 +26,7 @@
#include "localconsts.h"
#include "main.h"
-#include <SDL/SDL.h>
+#include <SDL.h>
#ifdef USE_OPENGL
@@ -34,7 +34,7 @@
#include <GLES/gl.h>
#else
#define GL_GLEXT_PROTOTYPES 1
-#include <SDL/SDL_opengl.h>
+#include <SDL_opengl.h>
#endif
#endif