diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 18:29:15 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-15 18:29:15 +0100 |
| commit | 83bbc5cc3afeea0f0b248cd755e1011f4760a298 (patch) | |
| tree | 1207131c234ad7c5ae6a5849d1d5d53de45b1b0b /src/resources/music.h | |
| parent | 7b3b60f86c545e0c5b6b8cb1ab7b1cbbf22d5e02 (diff) | |
| parent | 38708de52f00689088eda29f9b6ee257ce7038ad (diff) | |
| download | mana-client-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.gz mana-client-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.bz2 mana-client-83bbc5cc3afeea0f0b248cd755e1011f4760a298.tar.xz mana-client-83bbc5cc3afeea0f0b248cd755e1011f4760a298.zip | |
Merge commit 'aethyra/master'
Conflicts:
CMakeLists.txt
configure.ac
data/help/header.txt
packaging/windows/setup.nsi
po/POTFILES.in
src/being.cpp
src/being.h
src/game.cpp
src/gui/color.cpp
src/gui/color.h
src/gui/equipmentwindow.h
src/gui/popupmenu.cpp
src/gui/recorder.cpp
src/gui/setup_colors.h
src/gui/setup_keyboard.cpp
src/gui/setup_keyboard.h
src/gui/skill.cpp
src/gui/speechbubble.cpp
src/gui/speechbubble.h
src/gui/table.cpp
src/keyboardconfig.cpp
src/keyboardconfig.h
src/localplayer.cpp
src/main.cpp
src/main.h
src/map.cpp
src/resources/colordb.cpp
src/resources/colordb.h
src/resources/emotedb.cpp
src/resources/emotedb.h
src/text.cpp
src/text.h
src/tmw.rc
src/winver.h
Diffstat (limited to 'src/resources/music.h')
| -rw-r--r-- | src/resources/music.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/resources/music.h b/src/resources/music.h index 65f1ee88..34907cf1 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -22,8 +22,11 @@ #ifndef MUSIC_H #define MUSIC_H +#ifdef __APPLE__ +#include <SDL_mixer/SDL_mixer.h> +#else #include <SDL_mixer.h> - +#endif #include "resource.h" /** |