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

sev- sev at scummvm.org
Tue Feb 7 21:21:15 CET 2017


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

Summary:
5484f36f38 BUILD: Define SCUMM_64BITS on 64 bits platforms when not using configure
5da09383dc CREATE_PROJECT: Fix linking with Xcode when not disabling curl
7caeb60350 BASE: Ignore -NSDocumentRevisionDebugMode command line argument on OS X
14dcdb6103 CREATE_PROJECT: Add highres feature
2f4d14aba5 CREATE_PROJECT: Disable engines for which required features are not available
c1edd61669 Merge pull request #896 from criezy/create-project-fixes


Commit: 5484f36f38eddd9132e19e81c7b47e68f0c07846
    https://github.com/scummvm/scummvm/commit/5484f36f38eddd9132e19e81c7b47e68f0c07846
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-02-06T21:49:38Z

Commit Message:
BUILD: Define SCUMM_64BITS on 64 bits platforms when not using configure

This for example fixes the compilation of the fullpipe engine on 64 bits
platforms when using create_project.

Changed paths:
    common/scummsys.h


diff --git a/common/scummsys.h b/common/scummsys.h
index 27fcb84..938770b 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -309,6 +309,23 @@
 	#endif
 #endif
 
+//
+// Determine 64 bitness
+// Reference: http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros
+//
+#if !defined(HAVE_CONFIG_H)
+
+	#if defined(__x86_64__) || \
+		  defined(_M_X64) || \
+		  defined(__ppc64__) || \
+		  defined(__powerpc64__) || \
+		  defined(__LP64__)
+
+		#define SCUMM_64BITS
+
+	#endif
+
+#endif
 
 //
 // Some more system specific settings.


Commit: 5da09383dcead28ada62ff5a6ea4f1bf18e8401a
    https://github.com/scummvm/scummvm/commit/5da09383dcead28ada62ff5a6ea4f1bf18e8401a
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-02-06T21:51:40Z

Commit Message:
CREATE_PROJECT: Fix linking with Xcode when not disabling curl

Changed paths:
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 21fc256..221f28b 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -950,6 +950,7 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 	scummvmOSX_LdFlags.push_back("-lvorbis");
 	scummvmOSX_LdFlags.push_back("-lmad");
 	scummvmOSX_LdFlags.push_back("-lFLAC");
+	scummvmOSX_LdFlags.push_back("-lcurl");
 	if (setup.useSDL2) {
 		scummvmOSX_LdFlags.push_back("-lSDL2main");
 		scummvmOSX_LdFlags.push_back("-lSDL2");


Commit: 7caeb6035067126f431bd1699ad47021bbfeda1b
    https://github.com/scummvm/scummvm/commit/7caeb6035067126f431bd1699ad47021bbfeda1b
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-02-06T21:54:50Z

Commit Message:
BASE: Ignore -NSDocumentRevisionDebugMode command line argument on OS X

This is automatically added by Xcode when not toggling off the
"Allow debugging when using document Versions Browser". Since
this is on by default, and to avoid everybody having to google it,
I have decided to just ignore it on OS X.

Changed paths:
    base/commandLine.cpp


diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 2d7b9f2..51fee81 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -386,9 +386,15 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
 		} else {
 			// On MacOS X prior to 10.9 the OS is sometimes adding a -psn_X_XXXXXX argument (where X are digits)
 			// to pass the process serial number. We need to ignore it to avoid an error.
+			// When using XCode it also adds -NSDocumentRevisionsDebugMode YES argument if XCode option
+			// "Allow debugging when using document Versions Browser" is on (which is the default).
 #ifdef MACOSX
 			if (strncmp(s, "-psn_", 5) == 0)
 				continue;
+			if (strcmp(s, "-NSDocumentRevisionsDebugMode") == 0) {
+				++i; // Also skip the YES that follows
+				continue;
+			}
 #endif
 
 			bool isLongCmd = (s[0] == '-' && s[1] == '-');


Commit: 14dcdb6103852be0ae716ee1aa84da07bbdc9638
    https://github.com/scummvm/scummvm/commit/14dcdb6103852be0ae716ee1aa84da07bbdc9638
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-02-06T22:35:52Z

Commit Message:
CREATE_PROJECT: Add highres feature

Changed paths:
    devtools/create_project/create_project.cpp


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 6072120..9b171af 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1024,6 +1024,7 @@ const Feature s_features[] = {
 	{         "scalers",          "USE_SCALERS",         "", true,  "Scalers" },
 	{       "hqscalers",       "USE_HQ_SCALERS",         "", true,  "HQ scalers" },
 	{           "16bit",        "USE_RGB_COLOR",         "", true,  "16bit color support" },
+	{         "highres",          "USE_HIGHRES",         "", true,  "high resolution" },
 	{         "mt32emu",          "USE_MT32EMU",         "", true,  "integrated MT-32 emulator" },
 	{            "nasm",             "USE_NASM",         "", true,  "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling.
 	{          "opengl",           "USE_OPENGL",         "", true,  "OpenGL support" },


Commit: 2f4d14aba50ef437c24af905aeec6e95437eb8fa
    https://github.com/scummvm/scummvm/commit/2f4d14aba50ef437c24af905aeec6e95437eb8fa
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2017-02-06T23:18:02Z

Commit Message:
CREATE_PROJECT: Disable engines for which required features are not available

Changed paths:
    devtools/create_project/create_project.cpp
    devtools/create_project/create_project.h


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 9b171af..2baaf91 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -300,6 +300,19 @@ int main(int argc, char *argv[]) {
 		for (EngineDescList::iterator j = setup.engines.begin(); j != setup.engines.end(); ++j)
 			j->enable = false;
 	}
+	
+	// Disable engines for which we are missing dependencies
+	for (EngineDescList::const_iterator i = setup.engines.begin(); i != setup.engines.end(); ++i) {
+		if (i->enable) {
+			for (StringList::const_iterator ef = i->requiredFeatures.begin(); ef != i->requiredFeatures.end(); ++ef) {
+				FeatureList::iterator feature = std::find(setup.features.begin(), setup.features.end(), *ef);
+				if (feature != setup.features.end() && !feature->enable) {
+					setEngineBuildState(i->name, setup.engines, false);
+					break;
+				}
+			}
+		}
+	}
 
 	// Print status
 	cout << "Enabled engines:\n\n";
@@ -906,7 +919,7 @@ namespace {
  */
 bool parseEngine(const std::string &line, EngineDesc &engine) {
 	// Format:
-	// add_engine engine_name "Readable Description" enable_default ["SubEngineList"]
+	// add_engine engine_name "Readable Description" enable_default ["SubEngineList"] ["base games"] ["dependencies"]
 	TokenList tokens = tokenize(line);
 
 	if (tokens.size() < 4)
@@ -921,8 +934,14 @@ bool parseEngine(const std::string &line, EngineDesc &engine) {
 	engine.name = *token; ++token;
 	engine.desc = *token; ++token;
 	engine.enable = (*token == "yes"); ++token;
-	if (token != tokens.end())
+	if (token != tokens.end()) {
 		engine.subEngines = tokenize(*token);
+		++token;
+		if (token != tokens.end())
+			++token;
+		if (token != tokens.end())
+			engine.requiredFeatures = tokenize(*token);
+	}
 
 	return true;
 }
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index bd0dcf6..9f662ae 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -86,6 +86,11 @@ struct EngineDesc {
 	 * Whether the engine should be included in the build or not.
 	 */
 	bool enable;
+	
+	/**
+	 * Features required for this engine.
+	 */
+	StringList requiredFeatures;
 
 	/**
 	 * A list of all available sub engine names. Sub engines are engines


Commit: c1edd6166907a332dca0f4037f934e56e0ab61f0
    https://github.com/scummvm/scummvm/commit/c1edd6166907a332dca0f4037f934e56e0ab61f0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-07T21:20:31+01:00

Commit Message:
Merge pull request #896 from criezy/create-project-fixes

DEVTOOLS: Create project fixes

Changed paths:
    base/commandLine.cpp
    common/scummsys.h
    devtools/create_project/create_project.cpp
    devtools/create_project/create_project.h
    devtools/create_project/xcode.cpp







More information about the Scummvm-git-logs mailing list