summaryrefslogtreecommitdiff
path: root/src/sound
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2004-12-29 14:12:39 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2004-12-29 14:12:39 +0000
commit4988b2ae63413a754196b915c2de34f74ad3ce8d (patch)
treec4a761a6ed2fe0df0706af05631ba05968ae4e78 /src/sound
parentb2ee6c2da10288415e597d254a7694f7ddccbc78 (diff)
downloadmana-client-4988b2ae63413a754196b915c2de34f74ad3ce8d.tar.gz
mana-client-4988b2ae63413a754196b915c2de34f74ad3ce8d.tar.bz2
mana-client-4988b2ae63413a754196b915c2de34f74ad3ce8d.tar.xz
mana-client-4988b2ae63413a754196b915c2de34f74ad3ce8d.zip
Changes to disable sound on Windows.
Diffstat (limited to 'src/sound')
-rw-r--r--src/sound/sound.cpp7
-rw-r--r--src/sound/sound.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp
index 2505f203..8ec29d7b 100644
--- a/src/sound/sound.cpp
+++ b/src/sound/sound.cpp
@@ -19,11 +19,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifndef WIN32
+
+#include "sound.h"
+
#ifdef WIN32
#pragma warning(disable:4312)
#endif
-#include "sound.h"
/**
\brief install the sound engine
@@ -233,3 +236,5 @@ bool Sound::isMaxVol(int vol) {
if( vol > 0 && vol < 128 ) return false;
else return true;
}
+
+#endif /* not WIN32 */
diff --git a/src/sound/sound.h b/src/sound/sound.h
index a1055b02..b0719854 100644
--- a/src/sound/sound.h
+++ b/src/sound/sound.h
@@ -22,6 +22,7 @@
#ifndef __SOUND_H
#define __SOUND_H
+#ifndef WIN32
#ifdef WIN32
#pragma warning(disable:4312)
@@ -82,4 +83,5 @@ class Sound {
bool isMaxVol(int);
};
+#endif /* not WIN32 */
#endif