- fixed compilation with XCode and silenced several warnings

This commit is contained in:
Christoph Oelckers 2019-09-30 01:51:53 +02:00
commit 6bfa1bf692
17 changed files with 73 additions and 77 deletions

View file

@ -321,7 +321,7 @@ void I_ShutdownSound()
}
}
const char *GetSampleTypeName(enum SampleType type)
const char *GetSampleTypeName(SampleType type)
{
switch(type)
{
@ -331,7 +331,7 @@ const char *GetSampleTypeName(enum SampleType type)
return "(invalid sample type)";
}
const char *GetChannelConfigName(enum ChannelConfig chan)
const char *GetChannelConfigName(ChannelConfig chan)
{
switch(chan)
{

View file

@ -6,6 +6,7 @@
#include "doomtype.h"
#include "vectors.h"
#include "tarray.h"
#include "zmusic/sounddecoder.h"
#include "../../libraries/music_common/fileio.h"
class FileReader;
@ -116,9 +117,6 @@ struct FISoundChannel
void FindLoopTags(MusicIO::FileInterface *fr, uint32_t *start, bool *startass, uint32_t *end, bool *endass);
const char *GetSampleTypeName(enum SampleType type);
const char *GetChannelConfigName(enum ChannelConfig chan);
class SoundStream;

View file

@ -47,6 +47,9 @@
#include "zmusic/sounddecoder.h"
#include "filereadermusicinterface.h"
const char *GetSampleTypeName(SampleType type);
const char *GetChannelConfigName(ChannelConfig chan);
FModule OpenALModule{"OpenAL"};
#include "oalload.h"