From 7ee76f914a88f3236adcbf1c0cd26309d5bf1277 Mon Sep 17 00:00:00 2001
From: Christopher Snowhill <kode54@gmail.com>
Date: Thu, 6 Jan 2022 23:53:39 -0800
Subject: [PATCH] OpenMPT legacy: Correct header import paths so that the
 correct version of OpenMPT framework headers are used

---
 Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt.hpp      | 2 +-
 Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt_config.h | 2 +-
 Plugins/OpenMPT.old/OpenMPT/OMPTContainer.mm                  | 2 +-
 Plugins/OpenMPT.old/OpenMPT/OMPTDecoder.h                     | 2 +-
 Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt.hpp b/Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt.hpp
index 0cfbaf3f0..e51b6bfb3 100644
--- a/Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt.hpp
+++ b/Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt.hpp
@@ -10,7 +10,7 @@
 #ifndef LIBOPENMPT_HPP
 #define LIBOPENMPT_HPP
 
-#include <libOpenMPT/libopenmpt_config.h>
+#include <libOpenMPTOld/libopenmpt_config.h>
 
 #include <exception>
 #include <iosfwd>
diff --git a/Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt_config.h b/Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt_config.h
index 8a0241ec3..5aed65c28 100644
--- a/Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt_config.h
+++ b/Frameworks/OpenMPT.old/OpenMPT/libopenmpt/libopenmpt_config.h
@@ -178,6 +178,6 @@ LIBOPENMPT_DEPRECATED static const int LIBOPENMPT_DEPRECATED_STRING_CONSTANT = 0
 #endif
 
 
-#include <libOpenMPT/libopenmpt_version.h>
+#include <libOpenMPTOld/libopenmpt_version.h>
 
 #endif /* LIBOPENMPT_CONFIG_H */
diff --git a/Plugins/OpenMPT.old/OpenMPT/OMPTContainer.mm b/Plugins/OpenMPT.old/OpenMPT/OMPTContainer.mm
index 38f24e44c..729553328 100755
--- 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 <libOpenMPT/libopenmpt.hpp>
+#import <libOpenMPTOld/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 c1cdb5a5e..0636cf2dc 100755
--- a/Plugins/OpenMPT.old/OpenMPT/OMPTDecoder.h
+++ b/Plugins/OpenMPT.old/OpenMPT/OMPTDecoder.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import <libOpenMPT/libopenmpt.hpp>
+#import <libOpenMPTOld/libopenmpt.hpp>
 
 #include <vector>
 
diff --git a/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm b/Plugins/OpenMPT.old/OpenMPT/OMPTMetadataReader.mm
index 394e108ce..11e6b86cf 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 <libOpenMPT/libopenmpt.hpp>
+#import <libOpenMPTOld/libopenmpt.hpp>
 
 #import "Logging.H"