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

[SupSuper]

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:
260bcdd648 MSVC: Fix compilation on Windows SDK 8.1
aa9aa503fd MSVC: Fix compilation on non-ASCII systems


Commit: 260bcdd648d71aa0eb56be42b853bd0753742be7
    https://github.com/scummvm/scummvm/commit/260bcdd648d71aa0eb56be42b853bd0753742be7
Author: SupSuper (supsuper at gmail.com)
Date: 2020-03-26T07:18:40Z

Commit Message:
MSVC: Fix compilation on Windows SDK 8.1

Changed paths:
    devtools/create_project/msbuild.cpp


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index d892ce3265..93516f1ef8 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -275,8 +275,10 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
 	           "\t\t<ClCompile>\n";
 
 	// Language Extensions
-	if (setup.devTools || setup.tests || name == setup.projectName || enableLanguageExtensions)
+	if (setup.devTools || setup.tests || name == setup.projectName || enableLanguageExtensions) {
 		project << "\t\t\t<DisableLanguageExtensions>false</DisableLanguageExtensions>\n";
+		project << "\t\t\t<ConformanceMode>false</ConformanceMode>\n"; // Required for Windows SDK 8.1
+	}
 
 	// Edit and Continue
 	if ((name == setup.projectName || disableEditAndContinue) && !isRelease)


Commit: aa9aa503fdf45c7fb8c567e4a105baeb453c4c71
    https://github.com/scummvm/scummvm/commit/aa9aa503fdf45c7fb8c567e4a105baeb453c4c71
Author: SupSuper (supsuper at gmail.com)
Date: 2020-03-26T07:21:15Z

Commit Message:
MSVC: Fix compilation on non-ASCII systems

Changed paths:
    devtools/create_project/msbuild.cpp


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 93516f1ef8..03aa61a0cc 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -367,6 +367,7 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea
 	              "\t\t\t<CompileAs>Default</CompileAs>\n"
 	              "\t\t\t<MultiProcessorCompilation>true</MultiProcessorCompilation>\n"
 	              "\t\t\t<ConformanceMode>true</ConformanceMode>\n"
+	              "\t\t\t<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>\n"
 	              "\t\t</ClCompile>\n"
 	              "\t\t<Link>\n"
 	              "\t\t\t<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\n"