mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

apple: Use C function from CoreFoundation instead of ObjC from Foundation (#16476)

Browse Source
This commit is contained in:
Eric Warmenhoven 2024-04-29 21:30:56 -04:00 committed by GitHub
parent 217c83d893
commit 0415ed2f95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/drivers/platform_darwin.m
View File

@ -807,7 +807,11 @@ static const char* frontend_darwin_get_cpu_model_name(void)
static enum retro_language frontend_darwin_get_user_language(void) static enum retro_language frontend_darwin_get_user_language(void)
{ {
return retroarch_get_language_from_iso([[NSLocale preferredLanguages][0] UTF8String]); char s[128];
CFArrayRef langs = CFLocaleCopyPreferredLanguages();
CFStringRef langCode = CFArrayGetValueAtIndex(langs, 0);
CFStringGetCString(langCode, s, sizeof(s), kCFStringEncodingUTF8);
return retroarch_get_language_from_iso(s);
} }
#if (defined(OSX) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101200)) #if (defined(OSX) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101200))

6
pkg/apple/make-frameworks.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Prefer the expanded name, if available. # Prefer the expanded name, if available.
CODE_SIGN_IDENTITY_FOR_ITEMS="${EXPANDED_CODE_SIGN_IDENTITY_NAME}" CODE_SIGN_IDENTITY_FOR_ITEMS="${EXPANDED_CODE_SIGN_IDENTITY}"
if [ "${CODE_SIGN_IDENTITY_FOR_ITEMS}" = "" ] ; then if [ "${CODE_SIGN_IDENTITY_FOR_ITEMS}" = "" ] ; then
# Fall back to old behavior. # Fall back to old behavior.
CODE_SIGN_IDENTITY_FOR_ITEMS="${CODE_SIGN_IDENTITY}" CODE_SIGN_IDENTITY_FOR_ITEMS="${CODE_SIGN_IDENTITY}"
@ -37,7 +37,7 @@ for dylib in $(find "$BASE_DIR"/modules -maxdepth 1 -type f -regex '.*libretro.*
fwDir="${OUTDIR}/${fwName}.framework" fwDir="${OUTDIR}/${fwName}.framework"
mkdir -p "$fwDir" mkdir -p "$fwDir"
lipo -create "$dylib" -output "$fwDir/$fwName" lipo -create "$dylib" -output "$fwDir/$fwName"
echo "signing $fwName"
codesign --force --verbose --sign "${CODE_SIGN_IDENTITY_FOR_ITEMS}" "$fwDir"
sed -e "s,%CORE%,$fwName," -e "s,%IDENTIFIER%,$identifier," iOS/fw.tmpl > "$fwDir/Info.plist" sed -e "s,%CORE%,$fwName," -e "s,%IDENTIFIER%,$identifier," iOS/fw.tmpl > "$fwDir/Info.plist"
echo "signing $fwName"
codesign --force --verbose --sign "${CODE_SIGN_IDENTITY_FOR_ITEMS}" --timestamp=none --preserve-metadata=identifier,entitlements,flags --generate-entitlement-der "$fwDir"
done done