From b685f5d5c41c61a91909207f5d67227eb61504e0 Mon Sep 17 00:00:00 2001
From: Dzmitry Neviadomski <nevack.d@gmail.com>
Date: Thu, 25 Feb 2021 18:27:17 +0300
Subject: [PATCH] Preprocess Info.plist for sidplayfp Xcode subproject.

---
 Frameworks/libsidplayfp/Info.plist                        | 4 ++--
 .../libsidplayfp/sidplayfp.xcodeproj/project.pbxproj      | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Frameworks/libsidplayfp/Info.plist b/Frameworks/libsidplayfp/Info.plist
index 9bcb24442..a18c75a7a 100644
--- a/Frameworks/libsidplayfp/Info.plist
+++ b/Frameworks/libsidplayfp/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(PACKAGE_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>$(PACKAGE_VERSION)</string>
 </dict>
 </plist>
diff --git a/Frameworks/libsidplayfp/sidplayfp.xcodeproj/project.pbxproj b/Frameworks/libsidplayfp/sidplayfp.xcodeproj/project.pbxproj
index 6863573ba..82bb09aa7 100644
--- a/Frameworks/libsidplayfp/sidplayfp.xcodeproj/project.pbxproj
+++ b/Frameworks/libsidplayfp/sidplayfp.xcodeproj/project.pbxproj
@@ -1369,7 +1369,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
+				DEFINES_MODULE = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1390,6 +1390,8 @@
 					"$(SRCROOT)/sidplayfp/src",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
+				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/generated/src/config.h";
+				INFOPLIST_PREPROCESS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1408,7 +1410,7 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEFINES_MODULE = YES;
+				DEFINES_MODULE = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1425,6 +1427,8 @@
 					"$(SRCROOT)/sidplayfp/src",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
+				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/generated/src/config.h";
+				INFOPLIST_PREPROCESS = YES;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",