chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed building again

Browse source
This commit is contained in:
Chris Moeller 2014-08-02 21:29:00 -07:00
parent cc0f04d8f9
commit 1e33cabb7a
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Frameworks/vgmstream/vgmstream/src/vgmstream.h
View file

@ -16,14 +16,23 @@ enum { PATH_LIMIT = 32768 };
#define VGM_USE_MPEG #define VGM_USE_MPEG
/* disabled by default, defined for builds that support it */ /* disabled by default, defined for builds that support it */
//#define VGM_USE_G7221 //#define VGM_USE_G7221
//#define VGM_USE_MP4V2
//#define VGM_USE_FDKAAC
#include "streamfile.h" #include "streamfile.h"
#ifdef BUILD_VGMSTREAM
#include "coding/g72x_state.h" #include "coding/g72x_state.h"
#else
#include "g72x_state.h"
#endif
#ifdef VGM_USE_VORBIS #ifdef VGM_USE_VORBIS
#ifdef __APPLE__
#define __MACOSX__
#endif
#include <vorbis/vorbisfile.h> #include <vorbis/vorbisfile.h>
#endif #endif
#ifdef VGM_USE_MPEG #ifdef VGM_USE_MPEG
#include <mpg123.h> #include <mpg123/mpg123.h>
#endif #endif
#ifdef VGM_USE_G7221 #ifdef VGM_USE_G7221
#include "g7221.h" #include "g7221.h"
@ -42,8 +51,13 @@ enum { PATH_LIMIT = 32768 };
#include <maiatrac3plus.h> #include <maiatrac3plus.h>
#endif #endif
#ifdef BUILD_VGMSTREAM
#include "coding/acm_decoder.h" #include "coding/acm_decoder.h"
#include "coding/nwa_decoder.h" #include "coding/nwa_decoder.h"
#else
#include "acm_decoder.h"
#include "nwa_decoder.h"
#endif
/* The encoding type specifies the format the sound data itself takes */ /* The encoding type specifies the format the sound data itself takes */
typedef enum { typedef enum {