[Scummvm-git-logs] scummvm master -> 3f1086e089d3160c096dc321d845ca17d6ff263e

[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:
2af0fdd458 MSVC: Parallelize building of .asm files
3f1086e089 MSVC: Parallelize building across projects, speeding up multi-engine builds


Commit: 2af0fdd458458bd6d9f31d6aaf38343509ddea77
    https://github.com/scummvm/scummvm/commit/2af0fdd458458bd6d9f31d6aaf38343509ddea77
Author: SupSuper (supsuper at gmail.com)
Date: 2020-11-15T21:50:26Z

Commit Message:
MSVC: Parallelize building of .asm files

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


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index f0fa4fa786..fcb3696656 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -483,15 +483,15 @@ bool hasEnding(std::string const &fullString, std::string const &ending) {
 	}
 }
 
-namespace {
-
-inline void outputNasmCommand(std::ostream &projectFile, const std::string &config, const std::string &prefix) {
+void MSBuildProvider::outputNasmCommand(std::ostream &projectFile, const std::string &config, const std::string &prefix) {
 	projectFile << "\t\t\t<Command Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|Win32'\">nasm.exe -f win32 -g -o \"$(IntDir)" << prefix << "%(Filename).obj\" \"%(FullPath)\"</Command>\n"
 	            << "\t\t\t<Outputs Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|Win32'\">$(IntDir)" << prefix << "%(Filename).obj;%(Outputs)</Outputs>\n";
+	if (_version >= 15) {
+		projectFile << "\t\t\t<OutputItemType Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|Win32'\">Object</OutputItemType>\n"
+		            << "\t\t\t<BuildInParallel Condition=\"'$(Configuration)|$(Platform)'=='" << config << "|Win32'\">true</BuildInParallel>\n";
+	}
 }
 
-} // End of anonymous namespace
-
 void MSBuildProvider::writeFileListToProject(const FileNode &dir, std::ofstream &projectFile, const int,
                                              const std::string &objPrefix, const std::string &filePrefix) {
 	// Reset lists
diff --git a/devtools/create_project/msbuild.h b/devtools/create_project/msbuild.h
index 6631c64564..65e92719be 100644
--- a/devtools/create_project/msbuild.h
+++ b/devtools/create_project/msbuild.h
@@ -74,6 +74,8 @@ private:
 
 	void outputFilter(std::ostream &filters, const FileEntries &files, const std::string &action);
 	void outputFiles(std::ostream &projectFile, const FileEntries &files, const std::string &action);
+
+	void outputNasmCommand(std::ostream &projectFile, const std::string &config, const std::string &prefix);
 };
 
 } // namespace CreateProjectTool


Commit: 3f1086e089d3160c096dc321d845ca17d6ff263e
    https://github.com/scummvm/scummvm/commit/3f1086e089d3160c096dc321d845ca17d6ff263e
Author: SupSuper (supsuper at gmail.com)
Date: 2020-11-15T21:50:26Z

Commit Message:
MSVC: Parallelize building across projects, speeding up multi-engine builds

Changed paths:
  A dists/msvc/Directory.Build.props


diff --git a/dists/msvc/Directory.Build.props b/dists/msvc/Directory.Build.props
new file mode 100644
index 0000000000..fae8da1460
--- /dev/null
+++ b/dists/msvc/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+ <PropertyGroup>
+   <UseMultiToolTask>true</UseMultiToolTask>
+   <EnforceProcessCountAcrossBuilds>true</EnforceProcessCountAcrossBuilds>
+ </PropertyGroup>
+</Project>
\ No newline at end of file