[Scummvm-git-logs] scummvm master -> 1079a0f935e58ea0951595d0bd23ae4d1b91bba8

[SupSuper]

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:
ad09e09af5 CREATE-PROJECT: easy access to named features
b35e24c9fb CREATE-PROJECT: Set MSVC subsystem
1079a0f935 CREATE-PROJECT: Set subsystem for legacy visual studio projects


Commit: ad09e09af5edf76c62ab93fefdf66c87f73f63a9
    https://github.com/scummvm/scummvm/commit/ad09e09af5edf76c62ab93fefdf66c87f73f63a9
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-11-12T00:54:06Z

Commit Message:
CREATE-PROJECT: easy access to named features

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 bdc21ed964..6ab5e0daee 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -2138,3 +2138,16 @@ void error(const std::string &message) {
 	std::cerr << "ERROR: " << message << "!" << std::endl;
 	std::exit(-1);
 }
+
+bool BuildSetup::featureEnabled(std::string feature) const {
+	return getFeature(feature).enable;
+}
+
+Feature BuildSetup::getFeature(std::string feature) const {
+	for (FeatureList::const_iterator itr = features.begin(); itr != features.end(); ++itr) {
+		if (itr->name != feature)
+			continue;
+		return *itr;
+	}
+	error("invalid feature request: " + feature);
+}
diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h
index 4961fe4581..f3a05c1e76 100644
--- a/devtools/create_project/create_project.h
+++ b/devtools/create_project/create_project.h
@@ -251,6 +251,9 @@ struct BuildSetup {
 		useCanonicalLibNames = false;
 		useStaticDetection = true;
 	}
+
+	bool featureEnabled(std::string feature) const;
+	Feature getFeature(std::string feature) const;
 };
 
 /**


Commit: b35e24c9fbed2ed0e035ee9f0248cd2a5b1ae140
    https://github.com/scummvm/scummvm/commit/b35e24c9fbed2ed0e035ee9f0248cd2a5b1ae140
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-11-12T00:54:06Z

Commit Message:
CREATE-PROJECT: Set MSVC subsystem

It's a windows application unless the text console is enabled.

Changed paths:
    devtools/create_project/msbuild.cpp


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index f628bdbf44..f0fa4fa786 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -383,8 +383,12 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea
 	           << "\t\t\t<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>\n"
 	           << "\t\t</ClCompile>\n"
 	           << "\t\t<Link>\n"
-	           << "\t\t\t<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\n"
-	           << "\t\t\t<SubSystem>Console</SubSystem>\n";
+	           << "\t\t\t<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\n";
+	if (!setup.featureEnabled("text-console")) {
+		properties << "\t\t\t<SubSystem>Windows</SubSystem>\n";
+	} else {
+		properties << "\t\t\t<SubSystem>Console</SubSystem>\n";
+	}
 
 	if (!setup.devTools && !setup.tests)
 		properties << "\t\t\t<EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>\n";


Commit: 1079a0f935e58ea0951595d0bd23ae4d1b91bba8
    https://github.com/scummvm/scummvm/commit/1079a0f935e58ea0951595d0bd23ae4d1b91bba8
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-11-12T00:54:06Z

Commit Message:
CREATE-PROJECT: Set subsystem for legacy visual studio projects

Changed paths:
    devtools/create_project/visualstudio.cpp


diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index e436ae8084..64bb134e32 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -231,8 +231,12 @@ void VisualStudioProvider::outputGlobalPropFile(const BuildSetup &setup, std::of
 	           << "\t/>\n"
 	           << "\t<Tool\n"
 	           << "\t\tName=\"VCLinkerTool\"\n"
-	           << "\t\tIgnoreDefaultLibraryNames=\"\"\n"
-	           << "\t\tSubSystem=\"1\"\n";
+	           << "\t\tIgnoreDefaultLibraryNames=\"\"\n";
+	if (setup.featureEnabled("text-console")) {
+		properties << "\t\tSubSystem=\"1\"\n";
+	} else {
+		properties << "\t\tSubSystem=\"2\"\n";
+	}
 
 	if (!setup.devTools && !setup.tests)
 		properties << "\t\tEntryPointSymbol=\"WinMainCRTStartup\"\n";