.gitlab-ci.yml

@@ -359,6 +359,16 @@ unity-plugin-macos-aarch64:
         - monterey
         - macos-m1
 
+unity-plugin-macos-aarch64-trial:
+    extends: .unity-plugin-macos-common
+    dependencies:
+        - libvlc-macos-aarch64
+    variables:
+      <<: [*variables-macos-aarch64, *variables-trial]
+    tags:
+        - monterey
+        - macos-m1
+
 # libvlc iOS
 
 .variables-ios-x64: &variables-ios-x64

Assets/VLCUnity/Editor/VLCNativePluginProcessor.cs

@@ -217,11 +217,14 @@ internal static void CopyAndReplaceDirectory(string srcPath, string dstPath)
         [PostProcessBuildAttribute(1)]
         public static void OnPostprocessBuild(BuildTarget buildTarget, string path)
         {
-            if (buildTarget == BuildTarget.StandaloneOSX)
-                OnPostprocessBuildMac(path);
+            if (buildTarget == BuildTarget.StandaloneOSX || buildTarget == BuildTarget.iOS)
+            {
+                OnPostprocessBuildMac(buildTarget, path);
+                OnPostprocessBuildiPhone(path);
+            }
         }
 
-        internal static void OnPostprocessBuildMac(string path)
+        internal static void OnPostprocessBuildMac(BuildTarget buildTarget, string path)
         {
             PluginImporter[] importers = PluginImporter.GetAllImporters();
             var isArm64Host = RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
@@ -238,19 +241,31 @@ internal static void OnPostprocessBuildMac(string path)
                 if(pi.GetCompatibleWithAnyPlatform() || !pi.GetCompatibleWithPlatform(BuildTarget.StandaloneOSX))
                 {
                     pi.SetCompatibleWithAnyPlatform(false);
-                    pi.SetCompatibleWithEditor(true);
                     pi.SetCompatibleWithPlatform(BuildTarget.StandaloneOSX, true);
 
                     dirty = true;
                 }
 
                 // AnyCPU / macOS universal binary is not yet supported.
+
+                var isEditorCompatible = pi.GetCompatibleWithEditor();
                 if(pi.assetPath.Contains($"{MACOS_PATH}/ARM64/"))
                 {
-                    if(pi.GetCompatibleWithEditor())
+                    if(isArm64Host)
                     {
-                        pi.SetCompatibleWithEditor(isArm64Host);
-                        dirty = true;
+                        if(!isEditorCompatible)
+                        {
+                            pi.SetCompatibleWithEditor(true);
+                            dirty = true;
+                        }
+                    }
+                    else
+                    {
+                        if(isEditorCompatible)
+                        {
+                            pi.SetCompatibleWithEditor(false);
+                            dirty = true;
+                        }
                     }
                     if(pi.GetPlatformData(BuildTarget.StandaloneOSX, "CPU") != "ARM64")
                     {
@@ -260,10 +275,21 @@ internal static void OnPostprocessBuildMac(string path)
                 }
                 else if(pi.assetPath.Contains($"{MACOS_PATH}/x86_64/"))
                 {
-                    if(!pi.GetCompatibleWithEditor())
+                    if(!isArm64Host)
                     {
-                        pi.SetCompatibleWithEditor(!isArm64Host);
-                        dirty = true;
+                        if(!isEditorCompatible)
+                        {
+                            pi.SetCompatibleWithEditor(true);
+                            dirty = true;
+                        }
+                    }
+                    else
+                    {
+                        if(isEditorCompatible)
+                        {
+                            pi.SetCompatibleWithEditor(false);
+                            dirty = true;
+                        }
                     }
                     if(pi.GetPlatformData(BuildTarget.StandaloneOSX, "CPU") != "x86_64")
                     {
@@ -278,7 +304,7 @@ internal static void OnPostprocessBuildMac(string path)
                 }
             }
 
-            if(path.EndsWith(".app"))
+            if(path.EndsWith(".app") || buildTarget != BuildTarget.StandaloneOSX)
             {
                 // "Create XCode Project" is unchecked
                 return;
@@ -329,14 +355,6 @@ internal static void OnPostprocessBuildMac(string path)
             File.WriteAllText(projectPath, modifiedContent);
         }
 
-#if UNITY_IPHONE
-        [PostProcessBuildAttribute(1)]
-        public static void OnPostprocessBuild(BuildTarget buildTarget, string path)
-        {
-            if (buildTarget == BuildTarget.iOS)
-                OnPostprocessBuildiPhone(path);
-        }
-
         internal static void AddIOSPlugin(PBXProject proj, string target, string plugin)
         {
 //          Debug.Log("BUILD POSTPROCESS: adding plugin " + plugin);
@@ -416,6 +434,5 @@ internal static void OnPostprocessBuildiPhone(string path)
             }
             File.WriteAllText(projPath, proj.WriteToString());
         }
-#endif
     }
 }
\ No newline at end of file