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:48:24 +0200
commitd18445a37c9f01c37238858dbceed7533f636aed (patch)
tree0f4ad7369a16d119937be180f38af493396e2512 /src/resources
parent067ad70e9978fd678bb784783b2b5c3dc32746d1 (diff)
downloadmana-d18445a37c9f01c37238858dbceed7533f636aed.tar.gz
mana-d18445a37c9f01c37238858dbceed7533f636aed.tar.bz2
mana-d18445a37c9f01c37238858dbceed7533f636aed.tar.xz
mana-d18445a37c9f01c37238858dbceed7533f636aed.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.