From e7a8352548534044064eae848c6549d1e3cb111a Mon Sep 17 00:00:00 2001
From: Chris Moeller <kode54@gmail.com>
Date: Tue, 16 Sep 2014 16:55:15 -0700
Subject: [PATCH] And once again replace the Xcode specific build fixes that I
 clobbered

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

diff --git a/Frameworks/vgmstream/vgmstream/src/vgmstream.h b/Frameworks/vgmstream/vgmstream/src/vgmstream.h
index ff47785be..4be6821a8 100644
--- a/Frameworks/vgmstream/vgmstream/src/vgmstream.h
+++ b/Frameworks/vgmstream/vgmstream/src/vgmstream.h
@@ -18,12 +18,19 @@ enum { PATH_LIMIT = 32768 };
 //#define VGM_USE_G7221
 
 #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 +49,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 {