From 23211dc1a1defd1470df5a8942cd7d8d0ec9bac3 Mon Sep 17 00:00:00 2001
From: Eric Warmenhoven <eric@warmenhoven.org>
Date: Mon, 8 May 2023 01:27:53 -0400
Subject: [PATCH] Enable AltServer JIT for builds installed by Xcode

---
 pkg/apple/JITSupport.m   |  4 ++++
 pkg/apple/iOS/Info.plist | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkg/apple/JITSupport.m b/pkg/apple/JITSupport.m
index fd8058e35a..0f9b1c2b23 100644
--- a/pkg/apple/JITSupport.m
+++ b/pkg/apple/JITSupport.m
@@ -89,6 +89,10 @@ bool jb_enable_ptrace_hack(void) {
 
 void jb_start_altkit(void) {
 #if HAVE_ALTKIT
+   // asking AltKit/AltServer to debug us when we're already debugged is bad, very bad
+   if (jb_has_debugger_attached())
+      return;
+
    [[ALTServerManager sharedManager] autoconnectWithCompletionHandler:^(ALTServerConnection *connection, NSError *error) {
       if (error)
          return;
diff --git a/pkg/apple/iOS/Info.plist b/pkg/apple/iOS/Info.plist
index 83ae62ffbf..253e9454db 100644
--- a/pkg/apple/iOS/Info.plist
+++ b/pkg/apple/iOS/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ALTBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -48,10 +50,10 @@
 	<array>
 		<string>_altserver._tcp</string>
 	</array>
-   <key>NSLocalNetworkUsageDescription</key>
-   <string>RetroArch uses the local network to find and communicate with AltServer to enable JIT.</string>
-   <key>ALTDeviceID</key>
-   <string></string>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>RetroArch uses the local network to find and communicate with AltServer to enable JIT.</string>
+	<key>ALTDeviceID</key>
+	<string>$(TARGET_DEVICE_IDENTIFIER)</string>
 	<key>NSCameraUsageDescription</key>
 	<string>YES</string>
 	<key>UIApplicationExitsOnSuspend</key>