diff options
| author | David Athay <ko2fan@gmail.com> | 2011-11-17 19:38:52 -0600 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2011-11-17 19:38:52 -0600 |
| commit | cd0caeb87a10bc8ed645223c7155c9576b6fb102 (patch) | |
| tree | ac200bebed11b6fdd925a7289c26a637bfeb23f7 | |
| parent | b72dd300ab1a315f893facf8a302fa7c9dd00720 (diff) | |
| download | mana-cd0caeb87a10bc8ed645223c7155c9576b6fb102.tar.gz mana-cd0caeb87a10bc8ed645223c7155c9576b6fb102.tar.bz2 mana-cd0caeb87a10bc8ed645223c7155c9576b6fb102.tar.xz mana-cd0caeb87a10bc8ed645223c7155c9576b6fb102.zip | |
Change to local SDL inclues.
| -rw-r--r-- | src/gui/truetypefont.h | 2 | ||||
| -rw-r--r-- | src/resources/music.h | 2 | ||||
| -rw-r--r-- | src/resources/soundeffect.h | 2 | ||||
| -rw-r--r-- | src/resources/wallpaper.cpp | 2 | ||||
| -rw-r--r-- | src/sound.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index 689f45bf..e62ad20d 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -26,7 +26,7 @@ #include <guichan/font.hpp> #ifdef __APPLE__ -#include <SDL_ttf/SDL_ttf.h> +#include <SDL/SDL_ttf.h> #else #ifdef __WIN32__ #include <SDL/SDL_ttf.h> diff --git a/src/resources/music.h b/src/resources/music.h index c0cf5abe..9d0a32af 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -25,7 +25,7 @@ #include "resources/resource.h" #ifdef __APPLE__ -#include <SDL_mixer/SDL_mixer.h> +#include <SDL/SDL_mixer.h> #else #include <SDL_mixer.h> #endif diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index e7c832f4..fd4f50bd 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -25,7 +25,7 @@ #include "resources/resource.h" #ifdef __APPLE__ -#include <SDL_mixer/SDL_mixer.h> +#include <SDL/SDL_mixer.h> #else #include <SDL_mixer.h> #endif diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index c8857745..f9fc69ee 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -103,7 +103,7 @@ void Wallpaper::loadWallpapers() // First, get the base filename of the image: std::string filename = *i; - unsigned int separator = filename.rfind("_"); + int separator = filename.rfind("_"); filename = filename.substr(0, separator); // Check that the base filename doesn't have any '%' markers. diff --git a/src/sound.h b/src/sound.h index bf5dc3f6..9400c2a5 100644 --- a/src/sound.h +++ b/src/sound.h @@ -23,7 +23,7 @@ #define SOUND_H #ifdef __APPLE__ -#include <SDL_mixer/SDL_mixer.h> +#include <SDL/SDL_mixer.h> #else #include <SDL_mixer.h> #endif |