[Scummvm-git-logs] scummvm master -> 8c32927f393dddcbe3dfa1b19b38cd332283b6bd

[Mataniko]

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:
8c32927f39 CREATE_PROJECT: Add Text console debugger feature


Commit: 8c32927f393dddcbe3dfa1b19b38cd332283b6bd
    https://github.com/scummvm/scummvm/commit/8c32927f393dddcbe3dfa1b19b38cd332283b6bd
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-04-22T09:34:21-04:00

Commit Message:
CREATE_PROJECT: Add Text console debugger feature

Add feature flag to create_project to set USE_TEXT_CONSOLE_FOR_DEBUGGER
with --enable-text-console like configure script

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


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 2f116a9..3b739f7 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1060,25 +1060,26 @@ const Feature s_features[] = {
 	{    "sdlnet",     "USE_SDL_NET", "SDL_net",          true, "SDL_net support" },
 
 	// Feature flags
-	{            "bink",             "USE_BINK",         "", true,  "Bink video support" },
-	{         "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" },
-	{        "opengles",             "USE_GLES",         "", true,  "forced OpenGL ES mode" },
-	{         "taskbar",          "USE_TASKBAR",         "", true,  "Taskbar integration support" },
-	{           "cloud",            "USE_CLOUD",         "", true,  "Cloud integration support" },
-	{     "translation",      "USE_TRANSLATION",         "", true,  "Translation support" },
-	{          "vkeybd",        "ENABLE_VKEYBD",         "", false, "Virtual keyboard support"},
-	{       "keymapper",     "ENABLE_KEYMAPPER",         "", false, "Keymapper support"},
-	{   "eventrecorder", "ENABLE_EVENTRECORDER",         "", false, "Event recorder support"},
-	{         "updates",          "USE_UPDATES",         "", false, "Updates support"},
-	{         "dialogs",       "USE_SYSDIALOGS",         "", true,  "System dialogs support"},
-	{      "langdetect",       "USE_DETECTLANG",         "", true,  "System language detection support" } // This feature actually depends on "translation", there
-	                                                                                                      // is just no current way of properly detecting this...
+	{            "bink",                      "USE_BINK",  "", true,  "Bink video support" },
+	{         "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" },
+	{        "opengles",                      "USE_GLES",  "", true,  "forced OpenGL ES mode" },
+	{         "taskbar",                   "USE_TASKBAR",  "", true,  "Taskbar integration support" },
+	{           "cloud",                     "USE_CLOUD",  "", true,  "Cloud integration support" },
+	{     "translation",               "USE_TRANSLATION",  "", true,  "Translation support" },
+	{          "vkeybd",                 "ENABLE_VKEYBD",  "", false, "Virtual keyboard support"},
+	{       "keymapper",              "ENABLE_KEYMAPPER",  "", false, "Keymapper support"},
+	{   "eventrecorder",          "ENABLE_EVENTRECORDER",  "", false, "Event recorder support"},
+	{         "updates",                   "USE_UPDATES",  "", false, "Updates support"},
+	{         "dialogs",                "USE_SYSDIALOGS",  "", true,  "System dialogs support"},
+	{      "langdetect",                "USE_DETECTLANG",  "", true,  "System language detection support" }, // This feature actually depends on "translation", there
+	                                                                                                         // is just no current way of properly detecting this...
+	{    "text-console", "USE_TEXT_CONSOLE_FOR_DEBUGGER",  "", false, "Text console debugger" } // This feature is always applied in xcode projects
 };
 
 const Tool s_tools[] = {
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index b1228af..6817b5c 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1137,7 +1137,9 @@ void XcodeProvider::setupDefines(const BuildSetup &setup) {
 	REMOVE_DEFINE(_defines, "IPHONE_IOS7");
 	REMOVE_DEFINE(_defines, "IPHONE_SANDBOXED");
 	REMOVE_DEFINE(_defines, "SDL_BACKEND");
-	ADD_DEFINE(_defines, "USE_TEXT_CONSOLE_FOR_DEBUGGER");
+	if (!CONTAINS_DEFINE(_defines, "USE_TEXT_CONSOLE_FOR_DEBUGGER")) {
+		ADD_DEFINE(_defines, "USE_TEXT_CONSOLE_FOR_DEBUGGER");
+	}
 	ADD_DEFINE(_defines, "CONFIG_H");
 	ADD_DEFINE(_defines, "UNIX");
 	ADD_DEFINE(_defines, "SCUMMVM");