[Scummvm-git-logs] scummvm master -> ff602877e6ff46580a15136a30ed15e263221d3a

sev- sev at scummvm.org
Mon Jun 29 00:09:27 UTC 2020


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

Summary:
ff602877e6 DEVTOOLS: Unhardcode scummvm-name in create_project for XCode.


Commit: ff602877e6ff46580a15136a30ed15e263221d3a
    https://github.com/scummvm/scummvm/commit/ff602877e6ff46580a15136a30ed15e263221d3a
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2020-06-29T02:09:23+02:00

Commit Message:
DEVTOOLS: Unhardcode scummvm-name in create_project for XCode.

The existing code broke create_project in ResidualVM, as
the loop that creates the actual build configurations
generated the hash from the actual object name, which
for ResidualVM would be XCConfigurationList_residualvm.

The same logic was not applied when generating the reference,
as that would use the hardcoded name XCConfigurationList_scummvm.

This patch makes a minimal fix for that, by using the
PROJECT_NAME define instead of the hardcoded name.

Changed paths:
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index e325eb8707..42f774d279 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -745,7 +745,7 @@ void XcodeProvider::setupProject() {
 
 	Object *project = new Object(this, "PBXProject", "PBXProject", "PBXProject", "", "Project object");
 
-	project->addProperty("buildConfigurationList", getHash("XCConfigurationList_scummvm"), "Build configuration list for PBXProject \"" PROJECT_NAME "\"", kSettingsNoValue);
+	project->addProperty("buildConfigurationList", getHash("XCConfigurationList_" PROJECT_NAME), "Build configuration list for PBXProject \"" PROJECT_NAME "\"", kSettingsNoValue);
 	project->addProperty("compatibilityVersion", "Xcode 3.2", "", kSettingsNoValue | kSettingsQuoteVariable);
 	project->addProperty("developmentRegion", "English", "", kSettingsNoValue);
 	project->addProperty("hasScannedForEncodings", "1", "", kSettingsNoValue);




More information about the Scummvm-git-logs mailing list