diff --git a/Managers/UTMQemu.m b/Managers/UTMQemu.m index 7bf31ab0c..23039a986 100644 --- a/Managers/UTMQemu.m +++ b/Managers/UTMQemu.m @@ -180,7 +180,12 @@ - (void)startQemuRemote:(nonnull NSString *)name completion:(void(^)(BOOL,NSStri - (void)startQemu:(nonnull NSString *)arch completion:(void(^)(BOOL,NSString *))completion { [self printArgv]; - NSString *dylib = [NSString stringWithFormat:@"qemu-%@-softmmu.framework/qemu-%@-softmmu", arch, arch]; +#if TARGET_OS_IPHONE + NSString *base = @""; +#else + NSString *base = @"Versions/A/"; +#endif + NSString *dylib = [NSString stringWithFormat:@"qemu-%@-softmmu.framework/%@qemu-%@-softmmu", arch, base, arch]; if (_connection) { [self startQemuRemote:dylib completion:completion]; } else { diff --git a/Platform/UTMData.swift b/Platform/UTMData.swift index c1f7e5d1e..c4b25c1a8 100644 --- a/Platform/UTMData.swift +++ b/Platform/UTMData.swift @@ -475,11 +475,13 @@ class UTMData: ObservableObject { let bundleURL = Bundle.main.bundleURL #if os(macOS) let contentsURL = bundleURL.appendingPathComponent("Contents", isDirectory: true) + let base = "Versions/A/" #else let contentsURL = bundleURL + let base = "" #endif let frameworksURL = contentsURL.appendingPathComponent("Frameworks", isDirectory: true) - let framework = frameworksURL.appendingPathComponent("qemu-" + arch + "-softmmu.framework/qemu-" + arch + "-softmmu", isDirectory: false) + let framework = frameworksURL.appendingPathComponent("qemu-" + arch + "-softmmu.framework/" + base + "qemu-" + arch + "-softmmu", isDirectory: false) logger.error("\(framework.path)") return fileManager.fileExists(atPath: framework.path) } diff --git a/scripts/build_dependencies.sh b/scripts/build_dependencies.sh index bf3b2b912..540c9ecf2 100755 --- a/scripts/build_dependencies.sh +++ b/scripts/build_dependencies.sh @@ -346,7 +346,11 @@ fixup () { libname=${basefilename#lib*} dir=$(dirname "$g") if [ "$dir" == "$PREFIX/lib" ]; then - newname="@rpath/$libname.framework/$libname" + if [ "$PLATFORM" == "macos" ]; then + newname="@rpath/$libname.framework/Versions/A/$libname" + else + newname="@rpath/$libname.framework/$libname" + fi install_name_tool -change "$g" "$newname" "$NEWFILE" fi done