mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 14:09:42 +00:00
Code Issues Releases Wiki Activity

Avoid redefining SOUND_IN

Browse source
This commit is contained in:
Chris Robinson 2012-03-21 15:29:05 -07:00
parent 56c3b988cc
commit 9a139f511f
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwsound/soundmanager.cpp
View file

@ -23,13 +23,17 @@
*/ */
#ifdef OPENMW_USE_FFMPEG #ifdef OPENMW_USE_FFMPEG
#include "ffmpeg_decoder.hpp" #include "ffmpeg_decoder.hpp"
#ifndef SOUND_IN
#define SOUND_IN "FFmpeg" #define SOUND_IN "FFmpeg"
#endif #endif
#endif
#ifdef OPENMW_USE_MPG123 #ifdef OPENMW_USE_MPG123
#include "mpgsnd_decoder.hpp" #include "mpgsnd_decoder.hpp"
#ifndef SOUND_IN
#define SOUND_IN "mpg123,sndfile" #define SOUND_IN "mpg123,sndfile"
#endif #endif
#endif
namespace MWSound namespace MWSound