From dd35639174cff8c56b526ae65ab4eebd4582f063 Mon Sep 17 00:00:00 2001
From: Christopher Snowhill <kode54@gmail.com>
Date: Fri, 24 Jun 2022 15:18:15 -0700
Subject: [PATCH] [OpenMPT / OpenMPT Legacy] Fix include paths

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
---
 Plugins/OpenMPT.old/OpenMPT/OMPTContainer.mm             | 2 +-
 Plugins/OpenMPT.old/OpenMPT/OMPTDecoder.h                | 2 +-
 Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm        | 2 +-
 Plugins/OpenMPT.old/OpenMPTOld.xcodeproj/project.pbxproj | 2 ++
 Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj        | 2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Plugins/OpenMPT.old/OpenMPT/OMPTContainer.mm b/Plugins/OpenMPT.old/OpenMPT/OMPTContainer.mm
index 7098e4739..68020fec7 100644
--- a/Plugins/OpenMPT.old/OpenMPT/OMPTContainer.mm
+++ b/Plugins/OpenMPT.old/OpenMPT/OMPTContainer.mm
@@ -6,7 +6,7 @@
 //  Copyright 2018 __LoSnoCo__. All rights reserved.
 //
 
-#import <libOpenMPTOld/libopenmpt.hpp>
+#import <libopenmpt/libopenmpt.hpp>
 
 #import "OMPTContainer.h"
 #import "OMPTDecoder.h"
diff --git a/Plugins/OpenMPT.old/OpenMPT/OMPTDecoder.h b/Plugins/OpenMPT.old/OpenMPT/OMPTDecoder.h
index 33d49810c..ef7e89a4b 100644
--- a/Plugins/OpenMPT.old/OpenMPT/OMPTDecoder.h
+++ b/Plugins/OpenMPT.old/OpenMPT/OMPTDecoder.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import <libOpenMPTOld/libopenmpt.hpp>
+#import <libopenmpt/libopenmpt.hpp>
 
 #include <vector>
 
diff --git a/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm b/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm
index 7e961b5a9..4d6dd76fc 100644
--- a/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm
+++ b/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm
@@ -9,7 +9,7 @@
 #import "OMPTMetadataReader.h"
 #import "OMPTDecoder.h"
 
-#import <libOpenMPTOld/libopenmpt.hpp>
+#import <libopenmpt/libopenmpt.hpp>
 
 #import "Logging.H"
 
diff --git a/Plugins/OpenMPT.old/OpenMPTOld.xcodeproj/project.pbxproj b/Plugins/OpenMPT.old/OpenMPTOld.xcodeproj/project.pbxproj
index 29e3c311d..819b981a5 100644
--- a/Plugins/OpenMPT.old/OpenMPTOld.xcodeproj/project.pbxproj
+++ b/Plugins/OpenMPT.old/OpenMPTOld.xcodeproj/project.pbxproj
@@ -502,6 +502,7 @@
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
+				HEADER_SEARCH_PATHS = ../../ThirdParty/libopenmpt_old/include;
 				INFOPLIST_FILE = OpenMPT/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
 				LIBRARY_SEARCH_PATHS = (
@@ -521,6 +522,7 @@
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
+				HEADER_SEARCH_PATHS = ../../ThirdParty/libopenmpt_old/include;
 				INFOPLIST_FILE = OpenMPT/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
 				LIBRARY_SEARCH_PATHS = (
diff --git a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
index 4dd17b016..87f4fd838 100644
--- a/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
+++ b/Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj
@@ -493,6 +493,7 @@
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
+				HEADER_SEARCH_PATHS = ../../ThirdParty/libopenmpt/include;
 				INFOPLIST_FILE = OpenMPT/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
 				LIBRARY_SEARCH_PATHS = (
@@ -512,6 +513,7 @@
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
+				HEADER_SEARCH_PATHS = ../../ThirdParty/libopenmpt/include;
 				INFOPLIST_FILE = OpenMPT/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
 				LIBRARY_SEARCH_PATHS = (