From 3e51816813f56db8f8d2a43580b881c983ed70de Mon Sep 17 00:00:00 2001
From: Chris Moeller <kode54@gmail.com>
Date: Wed, 23 Apr 2014 22:13:33 -0700
Subject: [PATCH] Undid damage to vgmstream.h on merging new changes

---
 Frameworks/vgmstream/vgmstream/src/vgmstream.h | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Frameworks/vgmstream/vgmstream/src/vgmstream.h b/Frameworks/vgmstream/vgmstream/src/vgmstream.h
index 534e8b972..84331a97e 100644
--- a/Frameworks/vgmstream/vgmstream/src/vgmstream.h
+++ b/Frameworks/vgmstream/vgmstream/src/vgmstream.h
@@ -16,14 +16,23 @@ enum { PATH_LIMIT = 32768 };
 #define VGM_USE_MPEG
 /* disabled by default, defined for builds that support it */
 //#define VGM_USE_G7221
+//#define VGM_USE_MP4V2
+//#define VGM_USE_FDKAAC
 
 #include "streamfile.h"
+#ifdef BUILD_VGMSTREAM
 #include "coding/g72x_state.h"
+#else
+#include "g72x_state.h"
+#endif
 #ifdef VGM_USE_VORBIS
+#ifdef __APPLE__
+#define __MACOSX__
+#endif
 #include <vorbis/vorbisfile.h>
 #endif
 #ifdef VGM_USE_MPEG
-#include <mpg123.h>
+#include <mpg123/mpg123.h>
 #endif
 #ifdef VGM_USE_G7221
 #include "g7221.h"
@@ -42,8 +51,13 @@ enum { PATH_LIMIT = 32768 };
 #include <maiatrac3plus.h>
 #endif
 
+#ifdef BUILD_VGMSTREAM
 #include "coding/acm_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 */
 typedef enum {