From 01b91961ff938de99f10aa64b38c0e632d445332 Mon Sep 17 00:00:00 2001
From: Christopher Snowhill <kode54@gmail.com>
Date: Sun, 12 Mar 2017 21:38:46 -0700
Subject: [PATCH] Fix HighlyComplete for new mGBA header arrangement.

---
 .../HighlyComplete.xcodeproj/project.pbxproj           |  2 ++
 Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm     | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj b/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
index 539154b49..99e89c57b 100644
--- a/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
+++ b/Plugins/HighlyComplete/HighlyComplete.xcodeproj/project.pbxproj
@@ -704,6 +704,7 @@
 					HAVE_STDINT_H,
 					"MINIMAL_CORE=2",
 				);
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Frameworks/mGBA/mGBA/mgba/include";
 				INFOPLIST_FILE = "HighlyComplete/HighlyComplete-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = net.kode54.highlycomplete;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -724,6 +725,7 @@
 					EMU_LITTLE_ENDIAN,
 					"MINIMAL_CORE=2",
 				);
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Frameworks/mGBA/mGBA/mgba/include";
 				INFOPLIST_FILE = "HighlyComplete/HighlyComplete-Info.plist";
 				PRODUCT_BUNDLE_IDENTIFIER = net.kode54.highlycomplete;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm b/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm
index fa3ad9387..13cfc8f3b 100644
--- a/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm
+++ b/Plugins/HighlyComplete/HighlyComplete/HCDecoder.mm
@@ -22,12 +22,10 @@
 
 #import <HighlyQuixotic/qsound.h>
 
-extern "C" {
-#import <mGBA/core.h>
-#import <mGBA/blip_buf.h>
-#import <mGBA/vfs.h>
-#import <mGBA/log.h>
-}
+#import <mgba/core/core.h>
+#import <mgba/core/blip_buf.h>
+#import <mgba-util/vfs.h>
+#import <mgba/core/log.h>
 
 #include <vector>
 #import <SSEQPlayer/SDAT.h>