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

[sluicebox]

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:
335f90b136 CREATE_PROJECT: Set MSVC default subsystem to CONSOLE
d18b63bee4 SCI: Remove completed TODO


Commit: 335f90b136baf9696c0d8b5d36d98aa4eabfee60
    https://github.com/scummvm/scummvm/commit/335f90b136baf9696c0d8b5d36d98aa4eabfee60
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-15T14:32:27-08:00

Commit Message:
CREATE_PROJECT: Set MSVC default subsystem to CONSOLE

MSVC builds now use the CONSOLE subsystem by default,
just like all our other Windows builds.

--use-windows-subsystem is now available to generate
projects with the WINDOWS subsystem.

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


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 39310293b0d..57ce079c76d 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -303,6 +303,8 @@ int main(int argc, char *argv[]) {
 			setup.useWindowsUnicode = true;
 		} else if (!std::strcmp(argv[i], "--use-windows-ansi")) {
 			setup.useWindowsUnicode = false;
+		} else if (!std::strcmp(argv[i], "--use-windows-subsystem")) {
+			setup.useWindowsSubsystem = true;
 		} else if (!std::strcmp(argv[i], "--use-xcframework")) {
 			setup.useXCFramework = true;
 		} else if (!std::strcmp(argv[i], "--vcpkg")) {
@@ -753,6 +755,7 @@ void displayHelp(const char *exe) {
 	        "                            (default: true)\n"
 	        " --use-windows-ansi         Use Windows ANSI APIs\n"
 	        "                            (default: false)\n"
+	        " --use-windows-subsystem    Use Windows subsystem instead of Console\n"
 	        " --libs-path path           Specify the path of pre-built libraries instead of using the\n"
 			"                            " LIBS_DEFINE " environment variable\n "
 	        " --vcpkg                    Use vcpkg-provided libraries instead of pre-built libraries\n"
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index ce08bdf9053..7bad0d5749c 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -248,6 +248,7 @@ struct BuildSetup {
 	bool useSDL2;              ///< Whether to use SDL2 or not.
 	bool useStaticDetection;   ///< Whether to link detection features inside the executable or not.
 	bool useWindowsUnicode;    ///< Whether to use Windows Unicode APIs or ANSI APIs.
+	bool useWindowsSubsystem;  ///< Whether to use Windows subsystem or Console subsystem (default: Console)
 	bool useXCFramework;       ///< Whether to use Apple XCFrameworks instead of static libraries
 	bool useVcpkg;             ///< Whether to load libraries from vcpkg or SCUMMVM_LIBS
 
@@ -259,6 +260,7 @@ struct BuildSetup {
 		useSDL2 = true;
 		useStaticDetection = true;
 		useWindowsUnicode = true;
+		useWindowsSubsystem = false;
 		useXCFramework = false;
 		useVcpkg = false;
 	}
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 07a165554e0..ca9f6e8274b 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -416,10 +416,11 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea
 	           << "\t\t</ClCompile>\n"
 	           << "\t\t<Link>\n"
 	           << "\t\t\t<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\n";
-	if (!setup.featureEnabled("text-console") && !setup.devTools && !setup.tests) {
-		properties << "\t\t\t<SubSystem>Windows</SubSystem>\n";
-	} else {
+	// console subsystem is required for text-console, tools, and tests
+	if (!setup.useWindowsSubsystem || setup.featureEnabled("text-console") || setup.devTools || setup.tests) {
 		properties << "\t\t\t<SubSystem>Console</SubSystem>\n";
+	} else {
+		properties << "\t\t\t<SubSystem>Windows</SubSystem>\n";
 	}
 
 	if (!setup.devTools && !setup.tests)


Commit: d18b63bee43a82051f7a8ea2710f2193f5dbd842
    https://github.com/scummvm/scummvm/commit/d18b63bee43a82051f7a8ea2710f2193f5dbd842
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-15T14:32:27-08:00

Commit Message:
SCI: Remove completed TODO

We have a console command to list classes: class_table

Changed paths:
    engines/sci/console.cpp
    engines/sci/console.h


diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 4fcdaeef980..e37bb782990 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -96,7 +96,6 @@ Console::Console(SciEngine *engine) : GUI::Debugger(),
 	// General
 	registerCmd("help",				WRAP_METHOD(Console, cmdHelp));
 	// Kernel
-//	registerCmd("classes",			WRAP_METHOD(Console, cmdClasses));	// TODO
 	registerCmd("opcodes",			WRAP_METHOD(Console, cmdOpcodes));
 	registerCmd("selector",			WRAP_METHOD(Console, cmdSelector));
 	registerCmd("selectors",			WRAP_METHOD(Console, cmdSelectors));
diff --git a/engines/sci/console.h b/engines/sci/console.h
index 27ebb7a5199..615d9dfe8e3 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -19,8 +19,6 @@
  *
  */
 
- // Console module header file
-
 #ifndef SCI_CONSOLE_H
 #define SCI_CONSOLE_H
 
@@ -53,7 +51,6 @@ private:
 	// General
 	bool cmdHelp(int argc, const char **argv);
 	// Kernel
-//	bool cmdClasses(int argc, const char **argv);	// TODO
 	bool cmdOpcodes(int argc, const char **argv);
 	bool cmdSelector(int argc, const char **argv);
 	bool cmdSelectors(int argc, const char **argv);