[Scummvm-cvs-logs] scummvm master -> c69eb82527c356a9a65b83ee724e614b74c1f782
bluegr
bluegr at gmail.com
Mon Aug 22 12:10:17 CEST 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f629a32819 WINTERMUTE: Fix compilation with MSVC
c69eb82527 CREATE_PROJECT: Switch SDL backend to SDL2 by default
Commit: f629a328199708de7c35eba32eb17b6f69586df4
https://github.com/scummvm/scummvm/commit/f629a328199708de7c35eba32eb17b6f69586df4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-08-22T13:06:20+03:00
Commit Message:
WINTERMUTE: Fix compilation with MSVC
Change the way that EXTENDED_DEBUGGER_ENABLED is checked. The way it
was used, it triggered a fatal error C1017
Changed paths:
engines/wintermute/base/base_game.cpp
engines/wintermute/base/base_game.h
engines/wintermute/base/base_script_holder.cpp
engines/wintermute/base/scriptables/script.cpp
engines/wintermute/base/scriptables/script_engine.cpp
engines/wintermute/debugger.h
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index ce4c5fd..1af7e2b 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -71,7 +71,7 @@
#include "common/system.h"
#include "common/file.h"
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
#include "engines/wintermute/base/scriptables/debuggable/debuggable_script_engine.h"
#endif
@@ -402,7 +402,7 @@ bool BaseGame::initialize1() {
break;
}
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
_scEngine = new DebuggableScEngine(this);
#else
_scEngine = new ScEngine(this);
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 409cc20..6aacc1f 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -36,7 +36,7 @@
#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/debugger.h"
#include "common/events.h"
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
#include "engines/wintermute/base/scriptables/debuggable/debuggable_script_engine.h"
#endif
@@ -152,7 +152,7 @@ public:
BaseRenderer *_renderer;
BaseSoundMgr *_soundMgr;
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
DebuggableScEngine *_scEngine;
#else
ScEngine *_scEngine;
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index 7427a9b..fd9dd6a 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -466,7 +466,7 @@ void BaseScriptHolder::makeFreezable(bool freezable) {
ScScript *BaseScriptHolder::invokeMethodThread(const char *methodName) {
for (int i = _scripts.size() - 1; i >= 0; i--) {
if (_scripts[i]->canHandleMethod(methodName)) {
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
DebuggableScEngine* debuggableEngine;
debuggableEngine = dynamic_cast<DebuggableScEngine*>(_scripts[i]->_engine);
// TODO: Not pretty
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 938ec03..c133102 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -32,7 +32,7 @@
#include "engines/wintermute/base/scriptables/script_engine.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/memstream.h"
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
#include "engines/wintermute/base/scriptables/debuggable/debuggable_script.h"
#endif
namespace Wintermute {
@@ -1320,7 +1320,7 @@ ScScript *ScScript::invokeEventHandler(const Common::String &eventName, bool unb
if (!pos) {
return nullptr;
}
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
// TODO: Not pretty
DebuggableScEngine* debuggableEngine;
debuggableEngine = dynamic_cast<DebuggableScEngine*>(_engine);
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index 2612209..8d957c6 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -144,7 +144,7 @@ ScScript *ScEngine::runScript(const char *filename, BaseScriptHolder *owner) {
}
// add new script
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
DebuggableScEngine* debuggableEngine;
debuggableEngine = dynamic_cast<DebuggableScEngine*>(this);
// TODO: Not pretty
diff --git a/engines/wintermute/debugger.h b/engines/wintermute/debugger.h
index e5008be..6b1d231 100644
--- a/engines/wintermute/debugger.h
+++ b/engines/wintermute/debugger.h
@@ -23,11 +23,11 @@
#ifndef WINTERMUTE_DEBUGGER_H
#define WINTERMUTE_DEBUGGER_H
-#define EXTENDED_DEBUGGER_ENABLED true
+#define EXTENDED_DEBUGGER_ENABLED 1
#include "gui/debugger.h"
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
#include "engines/wintermute/base/scriptables/debuggable/debuggable_script.h"
#else
#include "engines/wintermute/base/scriptables/script.h"
@@ -71,7 +71,7 @@ public:
bool Cmd_ShowFps(int argc, const char **argv);
bool Cmd_DumpFile(int argc, const char **argv);
-#if EXTENDED_DEBUGGER_ENABLED == true
+#if EXTENDED_DEBUGGER_ENABLED
/**
* Step - break again on next line
*/
Commit: c69eb82527c356a9a65b83ee724e614b74c1f782
https://github.com/scummvm/scummvm/commit/c69eb82527c356a9a65b83ee724e614b74c1f782
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-08-22T13:09:49+03:00
Commit Message:
CREATE_PROJECT: Switch SDL backend to SDL2 by default
This adapts create_project with the changes in de04a68c06
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 8841eaa..70781ff 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -284,8 +284,8 @@ int main(int argc, char *argv[]) {
setup.devTools = true;
} else if (!std::strcmp(argv[i], "--tests")) {
setup.tests = true;
- } else if (!std::strcmp(argv[i], "--sdl2")) {
- setup.useSDL2 = true;
+ } else if (!std::strcmp(argv[i], "--sdl1")) {
+ setup.useSDL2 = false;
} else {
std::cerr << "ERROR: Unknown parameter \"" << argv[i] << "\"\n";
return -1;
@@ -700,7 +700,7 @@ void displayHelp(const char *exe) {
" --disable-<name> disable inclusion of the feature \"name\"\n"
"\n"
"SDL settings:\n"
- " --sdl2 link to SDL 2.0, instead of SDL 1.2\n"
+ " --sdl1 link to SDL 1.2, instead of SDL 2.0\n"
"\n"
" There are the following features available:\n"
"\n";
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index 1e417d4..bd0dcf6 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -239,7 +239,7 @@ struct BuildSetup {
tests = false;
runBuildEvents = false;
createInstaller = false;
- useSDL2 = false;
+ useSDL2 = true;
}
};
More information about the Scummvm-git-logs
mailing list