diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-06-03 21:28:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-06-03 21:28:49 +0300 |
| commit | 8315c94fde36046785cf86165021906a49c6d849 (patch) | |
| tree | 4b5e8ac7263b2fca078da5f1de30df77755924ef /src/gui | |
| parent | 88e2d16c070f480e1892044f329cd38df298003d (diff) | |
| download | manaverse-8315c94fde36046785cf86165021906a49c6d849.tar.gz manaverse-8315c94fde36046785cf86165021906a49c6d849.tar.bz2 manaverse-8315c94fde36046785cf86165021906a49c6d849.tar.xz manaverse-8315c94fde36046785cf86165021906a49c6d849.zip | |
Remove subdir SDL from SDL includes.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/botcheckerwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/sdlfont.h | 6 | ||||
| -rw-r--r-- | src/gui/sdlinput.h | 2 | ||||
| -rw-r--r-- | src/gui/selldialog.h | 2 | ||||
| -rw-r--r-- | src/gui/setup_input.cpp | 2 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 2 | ||||
| -rw-r--r-- | src/gui/textcommandeditor.cpp | 4 | ||||
| -rw-r--r-- | src/gui/whoisonline.cpp | 4 |
8 files changed, 11 insertions, 15 deletions
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index cf8415f25..ad5535559 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -22,8 +22,8 @@ #include "gui/botcheckerwindow.h" -#include <SDL/SDL.h> -#include <SDL/SDL_thread.h> +#include <SDL.h> +#include <SDL_thread.h> #include <vector> #include <algorithm> diff --git a/src/gui/sdlfont.h b/src/gui/sdlfont.h index cf1b156fd..48e6c404f 100644 --- a/src/gui/sdlfont.h +++ b/src/gui/sdlfont.h @@ -27,11 +27,7 @@ #include <guichan/color.hpp> #include <guichan/font.hpp> -#ifdef __WIN32__ -#include <SDL/SDL_ttf.h> -#else -#include <SDL/SDL_ttf.h> -#endif +#include <SDL_ttf.h> #include <list> #include <map> diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index 5d632142f..aa02e9554 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -61,7 +61,7 @@ #include "keyinput.h" -#include <SDL/SDL.h> +#include <SDL.h> #include <guichan/input.hpp> #include <guichan/keyinput.hpp> diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h index 9558c4322..7a5cf65d1 100644 --- a/src/gui/selldialog.h +++ b/src/gui/selldialog.h @@ -28,7 +28,7 @@ #include <guichan/actionlistener.hpp> #include <guichan/selectionlistener.hpp> -#include <SDL/SDL_types.h> +#include <SDL_types.h> class Button; class Item; diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp index 6379b3131..fa77996dd 100644 --- a/src/gui/setup_input.cpp +++ b/src/gui/setup_input.cpp @@ -39,7 +39,7 @@ #include <guichan/listmodel.hpp> -#include <SDL/SDL_keyboard.h> +#include <SDL_keyboard.h> #include "debug.h" diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 559684143..4e62d5445 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -54,7 +54,7 @@ #include <guichan/key.hpp> #include <guichan/listmodel.hpp> -#include <SDL/SDL.h> +#include <SDL.h> #include <algorithm> diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp index eaf6e3322..7b3703cfb 100644 --- a/src/gui/textcommandeditor.cpp +++ b/src/gui/textcommandeditor.cpp @@ -45,8 +45,8 @@ #include "resources/iteminfo.h" -#include <SDL/SDL.h> -#include <SDL/SDL_thread.h> +#include <SDL.h> +#include <SDL_thread.h> #include <algorithm> #include "debug.h" diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 037cac76a..3e101338e 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -46,8 +46,8 @@ #include "utils/gettext.h" -#include <SDL/SDL.h> -#include <SDL/SDL_thread.h> +#include <SDL.h> +#include <SDL_thread.h> #include <vector> #include <algorithm> |