From 44e6bd8b67846df28ac43babbf344e27ee71fa0e Mon Sep 17 00:00:00 2001
From: Xaverix <minesoft@wp.pl>
Date: Wed, 27 Nov 2024 22:28:02 +0100
Subject: [PATCH 1/2] Fixed plugin embedding build phase for macOS not being
added on older versions of Unity
---
.../Apple.Core_Unity/Assets/Apple.Core/Editor/AppleBuild.cs | 3 ++-
.../Assets/Apple.Core/Editor/AppleCoreBuildStep.cs | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleBuild.cs b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleBuild.cs
index 09760784..1ffb8b43 100644
--- a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleBuild.cs
+++ b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleBuild.cs
@@ -199,7 +199,8 @@ public static void OnPostProcessBuild(BuildTarget buildTarget, string generatedP
if (pbxProject != null)
{
string projectRelativeNativeLibraryRoot = AppleNativeLibraryUtility.GetDestinationNativeLibraryFolderRoot(buildTarget);
- pbxProject.AddShellScriptBuildPhase(pbxProject.GetUnityMainTargetGuid(), "Embed Apple Plug-in Libraries", "/bin/sh", GenerateEmbedNativeLibraryShellScript(projectRelativeNativeLibraryRoot));
+ var targetGuid = buildTarget == BuildTarget.StandaloneOSX ? pbxProject.TargetGuidByName(Application.productName) : pbxProject.GetUnityMainTargetGuid();
+ pbxProject.AddShellScriptBuildPhase(targetGuid, "Embed Apple Plug-in Libraries", "/bin/sh", GenerateEmbedNativeLibraryShellScript(projectRelativeNativeLibraryRoot));
pbxProject.WriteToFile(pbxProjectPath);
}
diff --git a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs
index 5024062c..124ab41e 100644
--- a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs
+++ b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs
@@ -20,7 +20,8 @@ public override void OnFinalizePostProcess(AppleBuildProfile appleBuildProfile,
var pbxProject = AppleBuild.GetPbxProject(buildTarget, generatedProjectPath);
if (pbxProject != null)
{
- pbxProject.AddBuildProperty(pbxProject.GetUnityMainTargetGuid(), "ENABLE_BITCODE", "NO");
+ var targetGuid = buildTarget == BuildTarget.StandaloneOSX ? pbxProject.TargetGuidByName(Application.productName) : pbxProject.GetUnityMainTargetGuid();
+ pbxProject.AddBuildProperty(buildTarget, "ENABLE_BITCODE", "NO");
if (buildTarget != BuildTarget.StandaloneOSX)
{
From 653b49ebb382dcceebda73d2a0cc0503d832492d Mon Sep 17 00:00:00 2001
From: Xaverix <minesoft@wp.pl>
Date: Thu, 28 Nov 2024 12:28:03 +0100
Subject: [PATCH 2/2] Fixed variable name in AddBuildProperty
---
.../Assets/Apple.Core/Editor/AppleCoreBuildStep.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs
index 124ab41e..9a3dbe08 100644
--- a/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs
+++ b/plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/AppleCoreBuildStep.cs
@@ -21,7 +21,7 @@ public override void OnFinalizePostProcess(AppleBuildProfile appleBuildProfile,
if (pbxProject != null)
{
var targetGuid = buildTarget == BuildTarget.StandaloneOSX ? pbxProject.TargetGuidByName(Application.productName) : pbxProject.GetUnityMainTargetGuid();
- pbxProject.AddBuildProperty(buildTarget, "ENABLE_BITCODE", "NO");
+ pbxProject.AddBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");
if (buildTarget != BuildTarget.StandaloneOSX)
{