iOS/tvOS: MoltenVK 1.2.8, and fix mame core signing (#16452)

This commit is contained in:
Eric Warmenhoven 2024-04-19 10:11:49 -04:00 committed by GitHub
parent 4a86255363
commit ca904a3f5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 61 additions and 8 deletions

View file

@ -2308,7 +2308,7 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
#ifdef _WIN32
vulkan_library = dylib_load("vulkan-1.dll");
#elif IOS
vulkan_library = dylib_load("libMoltenVK_libretro.framework");
vulkan_library = dylib_load("MoltenVK");
#elif __APPLE__
vulkan_library = dylib_load("libMoltenVK.dylib");
#else

View file

@ -29,9 +29,13 @@
073734A42A093A5700BF7397 /* JITSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 92A1F81727006CAE00DEAD2A /* JITSupport.m */; };
073734A62A093ACA00BF7397 /* AltKit in Frameworks */ = {isa = PBXBuildFile; productRef = 073734A52A093ACA00BF7397 /* AltKit */; };
076CA50D2B695C2C00840EA5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 076CA50C2B695C2C00840EA5 /* libz.tbd */; };
0778070B2BD2A70B00D13CD2 /* MoltenVK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0778070A2BD2A70B00D13CD2 /* MoltenVK.framework */; };
0778070C2BD2A70B00D13CD2 /* MoltenVK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0778070A2BD2A70B00D13CD2 /* MoltenVK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
077A8E202BCE31F3000ECA41 /* Frameworks in Resources */ = {isa = PBXBuildFile; fileRef = 077A8E1F2BCE31E5000ECA41 /* Frameworks */; };
0789FC302A07847E00D042B7 /* AltKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0789FC2F2A07847E00D042B7 /* AltKit */; };
07B7872D29E8FE8F0088B74F /* filters in Resources */ = {isa = PBXBuildFile; fileRef = 07B7872C29E8FE8F0088B74F /* filters */; };
07BC17D22BD2ACAE0005A0F2 /* MoltenVK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07BC17D12BD2ACAE0005A0F2 /* MoltenVK.framework */; };
07BC17D32BD2ACAE0005A0F2 /* MoltenVK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 07BC17D12BD2ACAE0005A0F2 /* MoltenVK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
07E8EBE32BCCD1E10070B42D /* Frameworks in Resources */ = {isa = PBXBuildFile; fileRef = 07E8EBE22BCCD1E10070B42D /* Frameworks */; };
07F7FB022A2DA8B800037C04 /* filters in Resources */ = {isa = PBXBuildFile; fileRef = 07F7FB012A2DA8B800037C04 /* filters */; };
9204BE0D1D319EF300BD49DB /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 50521A431AA23BF500185CC9 /* griffin_objc.m */; };
@ -158,6 +162,28 @@
name = "Embed Foundation Extensions";
runOnlyForDeploymentPostprocessing = 0;
};
0778070D2BD2A70B00D13CD2 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
0778070C2BD2A70B00D13CD2 /* MoltenVK.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
07BC17D42BD2ACAE0005A0F2 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
07BC17D32BD2ACAE0005A0F2 /* MoltenVK.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
9292D6F528F549D500E47A75 /* Embed Foundation Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@ -183,9 +209,11 @@
0718BC5F2ABBA807001F2CBE /* Network.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Network.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS17.0.sdk/System/Library/Frameworks/Network.framework; sourceTree = DEVELOPER_DIR; };
073DB2892B8706490001BA32 /* RetroArchTV.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RetroArchTV.entitlements; sourceTree = "<group>"; };
076CA50C2B695C2C00840EA5 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS17.2.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
0778070A2BD2A70B00D13CD2 /* MoltenVK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MoltenVK.framework; path = iOS/Frameworks/MoltenVK.framework; sourceTree = "<group>"; };
077A8E1F2BCE31E5000ECA41 /* Frameworks */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Frameworks; sourceTree = "<group>"; };
0789FC2E2A07845300D042B7 /* AltKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = AltKit; path = Frameworks/AltKit; sourceTree = "<group>"; };
07B7872C29E8FE8F0088B74F /* filters */ = {isa = PBXFileReference; lastKnownFileType = folder; path = filters; sourceTree = "<group>"; };
07BC17D12BD2ACAE0005A0F2 /* MoltenVK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MoltenVK.framework; path = tvOS/Frameworks/MoltenVK.framework; sourceTree = "<group>"; };
07E8EBE22BCCD1E10070B42D /* Frameworks */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Frameworks; path = iOS/Frameworks; sourceTree = SOURCE_ROOT; };
07F7FB012A2DA8B800037C04 /* filters */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = filters; path = iOS/filters; sourceTree = SOURCE_ROOT; };
501232C9192E5FC40063A359 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = SOURCE_ROOT; };
@ -502,6 +530,7 @@
9204BE1A1D319EF300BD49DB /* AudioToolbox.framework in Frameworks */,
9204BE1B1D319EF300BD49DB /* CoreAudio.framework in Frameworks */,
9204BE1C1D319EF300BD49DB /* UIKit.framework in Frameworks */,
0778070B2BD2A70B00D13CD2 /* MoltenVK.framework in Frameworks */,
9204BE1D1D319EF300BD49DB /* Foundation.framework in Frameworks */,
0789FC302A07847E00D042B7 /* AltKit in Frameworks */,
9204BE1E1D319EF300BD49DB /* CoreGraphics.framework in Frameworks */,
@ -518,6 +547,7 @@
926C77F121FD26E800103EDE /* GameController.framework in Frameworks */,
926C77EF21FD263800103EDE /* AudioToolbox.framework in Frameworks */,
073734A62A093ACA00BF7397 /* AltKit in Frameworks */,
07BC17D22BD2ACAE0005A0F2 /* MoltenVK.framework in Frameworks */,
0718BC632ABBAFB6001F2CBE /* Network.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -1235,6 +1265,7 @@
92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */,
0714E7132983A5AC00E6B45B /* libMoltenVK.dylib */,
9210C2F124B3A19100E6FE7C /* Metal.framework */,
07BC17D12BD2ACAE0005A0F2 /* MoltenVK.framework */,
9210C2F024B3A19100E6FE7C /* MetalKit.framework */,
92CC05C621FEDD0B00FF79F0 /* MobileCoreServices.framework */,
92CC05C421FEDC9F00FF79F0 /* CFNetwork.framework */,
@ -1251,6 +1282,7 @@
50E7189E184B88AA001956CE /* CoreVideo.framework */,
96366C5816C9ACF500D64A22 /* AudioToolbox.framework */,
96366C5416C9AC3300D64A22 /* CoreAudio.framework */,
0778070A2BD2A70B00D13CD2 /* MoltenVK.framework */,
96AFAE2916C1D4EA009DE44C /* UIKit.framework */,
96AFAE2B16C1D4EA009DE44C /* Foundation.framework */,
96AFAE2D16C1D4EA009DE44C /* CoreGraphics.framework */,
@ -1321,6 +1353,7 @@
9204BE271D319EF300BD49DB /* ShellScript */,
9204BE211D319EF300BD49DB /* Resources */,
9292D6F528F549D500E47A75 /* Embed Foundation Extensions */,
0778070D2BD2A70B00D13CD2 /* Embed Frameworks */,
);
buildRules = (
);
@ -1345,6 +1378,7 @@
92CC057521FE2D4900FF79F0 /* ShellScript */,
926C77D521FD1E6500103EDE /* Resources */,
0712A77B2B807AE400C9765F /* Embed Foundation Extensions */,
07BC17D42BD2ACAE0005A0F2 /* Embed Frameworks */,
);
buildRules = (
);
@ -1854,6 +1888,10 @@
DEPS_DIR = "$(SRCBASE)/deps";
DEVELOPMENT_TEAM = UK699V5ZS8;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/iOS/Frameworks",
);
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
HEADER_SEARCH_PATHS = (
@ -1878,6 +1916,7 @@
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/Frameworks/MoltenVK.framework",
);
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/iOS/modules";
MARKETING_VERSION = 1.18.0;
@ -1927,6 +1966,10 @@
DEPS_DIR = "$(SRCBASE)/deps";
DEVELOPMENT_TEAM = UK699V5ZS8;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/iOS/Frameworks",
);
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
HEADER_SEARCH_PATHS = (
@ -1951,6 +1994,7 @@
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/Frameworks/MoltenVK.framework",
);
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/iOS/modules";
MARKETING_VERSION = 1.18.0;
@ -2018,6 +2062,10 @@
DEVELOPMENT_TEAM = UK699V5ZS8;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/tvOS/Frameworks",
);
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -2045,6 +2093,7 @@
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/Frameworks/MoltenVK.framework",
);
LIBRARY_SEARCH_PATHS = (
"$(PROJECT_DIR)/tvOS/modules",
@ -2106,6 +2155,10 @@
DEVELOPMENT_TEAM = UK699V5ZS8;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/tvOS/Frameworks",
);
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -2133,6 +2186,7 @@
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/Frameworks/MoltenVK.framework",
);
LIBRARY_SEARCH_PATHS = (
"$(PROJECT_DIR)/tvOS/modules",

Binary file not shown.

Binary file not shown.

View file

@ -31,11 +31,7 @@ for dylib in "$BASE_DIR"/modules/*.dylib ; do
fwDir="$BASE_DIR/Frameworks/${fwName}.framework"
mkdir -p "$fwDir"
lipo -create "$dylib" -output "$fwDir/$fwName"
if codesign --display -r- "$fwDir/$fwName" 2>&1 | grep -q "${CODE_SIGN_IDENTITY_FOR_ITEMS}" ; then
echo "$fwName already signed"
else
echo "signing $fwName"
codesign --force --verbose --sign "${CODE_SIGN_IDENTITY_FOR_ITEMS}" "$fwDir/$fwName"
fi
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"
done

Binary file not shown.

View file

@ -86,7 +86,10 @@ function find_dylib() {
fi
}
if [ "$1" = "appstore" ] ; then
if [ "$1" = "all" ] ; then
get_all_cores
dylibs=(${allcores[*]})
elif [ "$1" = "appstore" ] ; then
get_all_cores
exports=(
mupen64plus_next