summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorSocapex <philippe_groarke@yahoo.ca>2012-08-13 17:53:52 -0400
committerErik Schilling <ablu.erikschilling@googlemail.com>2012-08-14 17:58:43 +0200
commit35108fc2196b1f0d540d0a3bcea9a0023d1c5cc5 (patch)
tree50c6a195c2c16e5866dbdde6a18b6245502640f6 /src/resources
parent46a6cee5e42c2be0d47e9048111eacd7ef929768 (diff)
downloadmana-client-35108fc2196b1f0d540d0a3bcea9a0023d1c5cc5.tar.gz
mana-client-35108fc2196b1f0d540d0a3bcea9a0023d1c5cc5.tar.bz2
mana-client-35108fc2196b1f0d540d0a3bcea9a0023d1c5cc5.tar.xz
mana-client-35108fc2196b1f0d540d0a3bcea9a0023d1c5cc5.zip
Can now build using cmake on OSX
Tested-by: Frost.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/music.h4
-rw-r--r--src/resources/soundeffect.h4
2 files changed, 0 insertions, 8 deletions
diff --git a/src/resources/music.h b/src/resources/music.h
index bc2a56ae..d370f0a5 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -24,11 +24,7 @@
#include "resources/resource.h"
-#ifdef __APPLE__
-#include <SDL/SDL_mixer.h>
-#else
#include <SDL_mixer.h>
-#endif
/**
* Defines a class for loading and storing music.
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index decc60a0..38d58681 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -24,11 +24,7 @@
#include "resources/resource.h"
-#ifdef __APPLE__
-#include <SDL/SDL_mixer.h>
-#else
#include <SDL_mixer.h>
-#endif
/**
* Defines a class for loading and storing sound effects.