[Scummvm-cvs-logs] scummvm master -> 2521449e79e6650a8663e0143d60d69239e58da8

sev- sev at scummvm.org
Fri Jul 5 20:09:24 CEST 2013


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

Summary:
701e640184 CONFIGURE: Don't allow the keymapper and the event recorder to be enabled simultaneously
4a12c69162 CREATE_PROJECT: Don't allow the keymapper and the event recorder to be enabled simultaneously
2521449e79 Merge pull request #351 from bluegr/eventrec_keymapper_build_warning


Commit: 701e6401849207c0dd76e20288a5621026329dd1
    https://github.com/scummvm/scummvm/commit/701e6401849207c0dd76e20288a5621026329dd1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-07-05T03:09:43-07:00

Commit Message:
CONFIGURE: Don't allow the keymapper and the event recorder to be enabled simultaneously

Changed paths:
    configure



diff --git a/configure b/configure
index b8bab15..e59a38b 100755
--- a/configure
+++ b/configure
@@ -3798,6 +3798,16 @@ define_in_config_if_yes $_vkeybd 'ENABLE_VKEYBD'
 define_in_config_if_yes $_keymapper 'ENABLE_KEYMAPPER'
 define_in_config_if_yes $_eventrec 'ENABLE_EVENTRECORDER'
 
+#
+# Check if the keymapper and the event recorder are enabled simultaneously
+#
+if test "$_keymapper" = yes ; then
+	if test "$_eventrec" = yes ; then
+		echo "ERROR: The keymapper and the event recorder cannot be enabled simultaneously currently, please disable one of the two"
+		exit 1
+	fi
+fi
+
 # Check whether to build translation support
 #
 echo_n "Building translation support... "


Commit: 4a12c691620de09011fda6f06b3a389566a4823c
    https://github.com/scummvm/scummvm/commit/4a12c691620de09011fda6f06b3a389566a4823c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-07-05T03:10:04-07:00

Commit Message:
CREATE_PROJECT: Don't allow the keymapper and the event recorder to be enabled simultaneously

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 129e9f2..480f6a9 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -310,6 +310,17 @@ int main(int argc, char *argv[]) {
 			cout << "    " << i->description << '\n';
 	}
 
+	// Check if the keymapper and the event recorder are enabled simultaneously
+	bool keymapperEnabled = false;
+	for (FeatureList::const_iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
+		if (i->enable && !strcmp(i->name, "keymapper"))
+			keymapperEnabled = true;
+		if (i->enable && !strcmp(i->name, "eventrecorder") && keymapperEnabled) {
+			std::cerr << "ERROR: The keymapper and the event recorder cannot be enabled simultaneously currently, please disable one of the two\n";
+			return -1;
+		}
+	}
+
 	// Setup defines and libraries
 	setup.defines = getEngineDefines(setup.engines);
 	setup.libraries = getFeatureLibraries(setup.features);


Commit: 2521449e79e6650a8663e0143d60d69239e58da8
    https://github.com/scummvm/scummvm/commit/2521449e79e6650a8663e0143d60d69239e58da8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-07-05T11:08:36-07:00

Commit Message:
Merge pull request #351 from bluegr/eventrec_keymapper_build_warning

RECORDER: Don't allow the event recorder and the keymapper to be enabled simultaneously

Changed paths:
    configure
    devtools/create_project/create_project.cpp









More information about the Scummvm-git-logs mailing list