Merge branch 'macos-build-fixes' into 'master'

MACOS build fixes

See merge request ryubing/ryujinx!12

.gitignore

@@ -178,3 +178,7 @@ PublishProfiles/
 
 # Ignore MacOS Attribute Files
 ._*
+
+# Ignore distribution build files
+distribution/macos/temp/
+distribution/macos/output/

assets/locales.json

@@ -19914,7 +19914,7 @@
         "pl_PL": "Skróty Klawiszowe Klawiatury",
         "pt_BR": "Atalhos do Teclado",
         "ru_RU": "Горячие клавиши",
-        "sv_SE": "Snabbtangenter för tangentbord",
+        "sv_SE": "Snabbtangenter",
         "th_TH": "ปุ่มลัดของคีย์บอร์ด",
         "tr_TR": "Klavye Kısayolları",
         "uk_UA": "Гарячі клавіші",

distribution/macos/bundle_fix_up.py

@@ -562,9 +562,11 @@ search_path = [
 
 
 for path in content_directory.rglob("**/*.dylib"):
+    if not path.name.startswith("._"):
         current_search_path = [path.parent]
         current_search_path.extend(search_path)
 
+        print(f"Fixing path '{path}' using search path of '{current_search_path}' for context of '{content_directory}'.")
         fixup_dylib(
             path,
             get_path_related_to_target_exec(content_directory, path),
@@ -573,6 +575,7 @@ for path in content_directory.rglob("**/*.dylib"):
         )
 
 for path in content_directory.rglob("**/*.so"):
+    if not path.name.startswith("._"):
         current_search_path = [path.parent]
         current_search_path.extend(search_path)
 

distribution/macos/create_app_bundle.sh

@@ -30,9 +30,14 @@ cp -r "$PUBLISH_DIRECTORY/THIRDPARTY.md" "$APP_BUNDLE_DIRECTORY/Contents/Resourc
 echo -n "APPL????" > "$APP_BUNDLE_DIRECTORY/Contents/PkgInfo"
 
 # Fixup libraries and executable
+echo "Running bundle fix up python script"
 python3 bundle_fix_up.py "$APP_BUNDLE_DIRECTORY" MacOS/Ryujinx
 
+# Resign all dyplib files as ad-hoc after changing them
+find "$APP_BUNDLE_DIRECTORY/Contents/Frameworks" -type f -name "*.dylib" -exec codesign --force --sign - {} \;
+
 # Now sign it
+echo "Starting signing process"
 if ! [ -x "$(command -v codesign)" ];
 then
     if ! [ -x "$(command -v rcodesign)" ];
@@ -42,9 +47,9 @@ then
     fi
 
     # cargo install apple-codesign
-    echo "Usign rcodesign for ad-hoc signing"
+    echo "Using rcodesign for ad-hoc signing"
     rcodesign sign --entitlements-xml-path "$ENTITLEMENTS_FILE_PATH" "$APP_BUNDLE_DIRECTORY"
 else
-    echo "Usign codesign for ad-hoc signing"
+    echo "Using codesign for ad-hoc signing"
     codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f -s - "$APP_BUNDLE_DIRECTORY"
 fi