Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ios-vulkan-ppsspp, and a small cloud save fix #15801

Merged
merged 1 commit into from
Oct 15, 2023
Merged

Fix ios-vulkan-ppsspp, and a small cloud save fix #15801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
070A88432A4E7AA9003161C0 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 070A88422A4E7AA9003161C0 /* OpenAL.framework */; };
0714E7152983A5E500E6B45B /* libMoltenVK.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 0714E7132983A5AC00E6B45B /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
0718BC632ABBAFB6001F2CBE /* Network.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0718BC5F2ABBA807001F2CBE /* Network.framework */; };
0734BB242ADB7FEE00EBDCAD /* libMoltenVK.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 92EDD1622982E40C00AD33B4 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
073734A42A093A5700BF7397 /* JITSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 92A1F81727006CAE00DEAD2A /* JITSupport.m */; };
073734A62A093ACA00BF7397 /* AltKit in Frameworks */ = {isa = PBXBuildFile; productRef = 073734A52A093ACA00BF7397 /* AltKit */; };
0789FC302A07847E00D042B7 /* AltKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0789FC2F2A07847E00D042B7 /* AltKit */; };
Expand Down Expand Up @@ -134,6 +135,17 @@
name = "Embed Libraries";
runOnlyForDeploymentPostprocessing = 0;
};
0734BB252ADB7FEE00EBDCAD /* Embed Libraries */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
0734BB242ADB7FEE00EBDCAD /* libMoltenVK.dylib in Embed Libraries */,
);
name = "Embed Libraries";
runOnlyForDeploymentPostprocessing = 0;
};
9292D6F528F549D500E47A75 /* Embed Foundation Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -1242,6 +1254,7 @@
9204BE271D319EF300BD49DB /* ShellScript */,
9204BE211D319EF300BD49DB /* Resources */,
9292D6F528F549D500E47A75 /* Embed Foundation Extensions */,
0734BB252ADB7FEE00EBDCAD /* Embed Libraries */,
);
buildRules = (
);
Expand Down
3 changes: 3 additions & 0 deletions tasks/task_cloudsync.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,9 +840,12 @@ static void task_cloud_sync_diff_next(task_cloud_sync_state_t *sync_state)
if (!CS_FILE_DELETED(server_file))
task_cloud_sync_delete_server_file(sync_state);
else
{
/* already deleted, oh well */
task_cloud_sync_add_to_updated_manifest(sync_state, CS_FILE_KEY(server_file), NULL, true);
task_cloud_sync_add_to_updated_manifest(sync_state, CS_FILE_KEY(server_file), NULL, false);
/* we don't mark need_manifest_uploaded here, nothing has changed */
}
sync_state->local_idx++;
sync_state->server_idx++;
}
Expand Down