From 0440c10440e313cb4f719aef985f3a57794a5cef Mon Sep 17 00:00:00 2001
From: Ozgur Ersoy <git@moersoy.com>
Date: Tue, 15 Apr 2025 21:36:56 +0200
Subject: [PATCH] fix(actions): remove redundant macOS build settings and
 streamline build script for improved clarity

---
 Source/LuckyWorld.Target.cs           | 20 ------------
 Source/LuckyWorld/LuckyWorld.Build.cs |  7 -----
 Source/LuckyWorldEditor.Target.cs     |  7 -----
 scripts/mac_build.sh                  | 44 +++++++++++++++++++--------
 4 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/Source/LuckyWorld.Target.cs b/Source/LuckyWorld.Target.cs
index 02465f3b..86aedaa3 100644
--- a/Source/LuckyWorld.Target.cs
+++ b/Source/LuckyWorld.Target.cs
@@ -10,14 +10,6 @@ public class LuckyWorldTarget : TargetRules
 		Type = TargetType.Game;
 		DefaultBuildSettings = BuildSettingsVersion.V5;
 		
-		// Fix for "Targets with a unique build environment cannot be built with an installed engine"
-		bOverrideBuildEnvironment = true;
-		BuildEnvironment = TargetBuildEnvironment.Shared;
-		
-		// Ensure proper build configuration
-		bUseLoggingInShipping = true;
-		bShouldCompileAsDLL = false;
-		
 		ExtraModuleNames.AddRange( new string[] { "LuckyWorld" } );
 
 		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
@@ -26,17 +18,5 @@ public class LuckyWorldTarget : TargetRules
 		{
 			this.bUseLoggingInShipping = true;
 		}
-
-		// macOS specific settings
-		if (Target.Platform == UnrealTargetPlatform.Mac)
-		{
-			// Force use the bundle ID from DefaultGame.ini
-			GlobalDefinitions.Add("APP_BUNDLE_IDENTIFIER=com.luckyrobots.luckyworld");
-			GlobalDefinitions.Add("APP_BUNDLE_NAME=LuckyWorld");
-			GlobalDefinitions.Add("APP_BUNDLE_DISPLAY_NAME=LuckyWorld");
-			
-			// Don't use local automatic code signing for builds
-			// bDisableAutomaticCodeSigning property is not available in UE 5.5
-		}
 	}
 }
diff --git a/Source/LuckyWorld/LuckyWorld.Build.cs b/Source/LuckyWorld/LuckyWorld.Build.cs
index b094e6f3..9d80c354 100644
--- a/Source/LuckyWorld/LuckyWorld.Build.cs
+++ b/Source/LuckyWorld/LuckyWorld.Build.cs
@@ -20,12 +20,5 @@ public class LuckyWorld : ModuleRules
 
 		// To include OnlineSubsystemSteam, add it to the plugins section in your uproject file with the Enabled attribute set to true
 
-					// Set the bundle identifier for macOS builds
-		if (Target.Platform == UnrealTargetPlatform.Mac)
-		{
-			PublicDefinitions.Add("APP_BUNDLE_IDENTIFIER=com.luckyrobots.luckyworld");
-			PublicDefinitions.Add("APP_BUNDLE_NAME=LuckyWorld");
-			PublicDefinitions.Add("APP_BUNDLE_DISPLAY_NAME=LuckyWorld");
-		}
 	}
 }
diff --git a/Source/LuckyWorldEditor.Target.cs b/Source/LuckyWorldEditor.Target.cs
index e2aa741f..b1d60a9d 100644
--- a/Source/LuckyWorldEditor.Target.cs
+++ b/Source/LuckyWorldEditor.Target.cs
@@ -10,13 +10,6 @@ public class LuckyWorldEditorTarget : TargetRules
 		Type = TargetType.Editor;
 		DefaultBuildSettings = BuildSettingsVersion.V5;
 		
-		// Fix for "Targets with a unique build environment cannot be built with an installed engine"
-		bOverrideBuildEnvironment = true;
-		BuildEnvironment = TargetBuildEnvironment.Shared;
-		
-		// Ensure proper build configuration
-		bShouldCompileAsDLL = false;
-
 		ExtraModuleNames.AddRange( new string[] { "LuckyWorld" } );
 
 		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
diff --git a/scripts/mac_build.sh b/scripts/mac_build.sh
index 429f26c9..d07c69ab 100755
--- a/scripts/mac_build.sh
+++ b/scripts/mac_build.sh
@@ -30,7 +30,7 @@ echo "Archive directory: $ARCHIVE_DIR"
 
 # More selective cleanup - don't remove DerivedDataCache
 echo "🧹 Cleaning build artifacts..."
-rm -rf Intermediate/Build/Mac Saved/Cooked
+rm -rf DerivedDataCache Intermediate Binaries Saved
 mkdir -p "$ARCHIVE_DIR"
 
 # Generate project files
@@ -39,25 +39,43 @@ echo "📝 Generating project files..."
 
 # Run the build command with simplified parameters and more diagnostics
 echo "🔨 Starting build process..."
-"$UE_UAT" -ScriptsForProject="$PROJECT_FILE" BuildCookRun \
-  -project="$PROJECT_FILE" \
+"$UE_UAT" -ScriptsForProject="$PROJECT_FILE" Turnkey \
+  -command=VerifySdk \
   -platform=Mac \
-  -clientconfig=Shipping \
+  -UpdateIfNeeded \
+  -EditorIO \
+  -EditorIOPort=59484 \
+  -project="$PROJECT_FILE" \
+  BuildCookRun \
+  -nop4 \
+  -utf8output \
+  -cook \
+  -project="$PROJECT_FILE" \
   -target=LuckyWorld \
-  -build \
-  -cook -iterate -CookOnTheFly -CookMapsOnly \
+  -unrealexe="$UE_EDITOR" \
+  -platform=Mac \
+  -installed \
   -stage \
-  -skipStage=SignExecutables \
+  -archive \
+  -package \
+  -build \
+  -iterativecooking \
   -pak \
+  -iostore \
   -compressed \
   -prereqs \
-  -iostore \
-  -package \
-  -archive \
   -archivedirectory="$ARCHIVE_DIR" \
-  -verbose \
-  -ddc=DerivedDataBackendGraph \
-  -CrashReporter
+  -CrashReporter \
+  -clientconfig=Shipping \
+  # -nocompile \
+  # -nocompileuat \
+  # -nocompileeditor \
+  # -skipbuildeditor \
+
+  # enable these if you want to test build without pak and iostore (you're just testing the build)
+  # -skipiostore \
+  # -skippak \ (disable -pak and -iostore)
+  #!/bin/bash
 
 # Check for errors in the build process
 BUILD_STATUS=$?