[Scummvm-git-logs] scummvm master -> 7c013bdb2cda08d687ebccc0f2f640c7f346e636

sev- noreply at scummvm.org
Sat Jun 28 22:38:10 UTC 2025


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
7c013bdb2c BASE: Automatically detect Mac files


Commit: 7c013bdb2cda08d687ebccc0f2f640c7f346e636
    https://github.com/scummvm/scummvm/commit/7c013bdb2cda08d687ebccc0f2f640c7f346e636
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-06-29T00:37:34+02:00

Commit Message:
BASE: Automatically detect Mac files

This essentially obsoletes --md5mac. Now, with --md5 we still
compute resource forks checksums if mac file is detected

Changed paths:
    base/commandLine.cpp


diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 121d4385478..a14faee4b81 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -2085,6 +2085,20 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
 			steps = 1;
 		}
 
+		// Prrobe mac file
+		if (command == "md5") {
+			Common::SearchSet dir;
+			Common::FSNode dirNode(Filename.getParent());
+			dir.addDirectory(dirNode);
+			Common::Path fileName = Filename.getLastComponent();
+
+			Common::MacResManager macResMan;
+			if (macResMan.open(fileName, dir)) {
+				warning("Mac resources detected");
+				command = "md5mac";
+			}
+		}
+
 		for (uint i = 0; i < steps; i++) {
 			if (command == "md5") {
 				Common::FSNode path(Filename);




More information about the Scummvm-git-logs mailing list