[Scummvm-git-logs] scummvm master -> 015293bc2e2c2cc84bc370bbf569c4289f5ad71d

Helco noreply at scummvm.org
Sun Nov 2 14:27:37 UTC 2025 

This automated email contains information about 14 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
2fc2ad76a3 CREATE_PROJECT: Use VcPkg manifests on MSVC >= 17
950385eac6 CREATE_PROJECT: Fix paths in pre/post-build commands
25e5e1722f CXXTEST: Fix compilation on MSVC
26c023bf1d CREATE_PROJECT: Do not use TESTS definition within if blocks
b0e2d1e3ba CREATE_PROJECT: Fix null_osystem.cpp missing for MSVC tests project
ff23782647 CREATE_PROJECT: Remove base-backend.cpp from MSVC test project
e3e6983f7f TEST: Rename directories to conform with other names
ec7e4a9d79 CREATE_PROJECT: Fix encoding.dat not being copied for MSVC tests project
7199f2571a MATH: Fix deg2rad test compilation for MSVC
c534a138e0 MATH: Use floats where appropriate
87fba6a395 CREATE_PROJECT: Keep components for test project enabled
0798cc7c92 CREATE_PROJECT: Fix cxxtestgen.py invocation
1aad68f13c CREATE_PROJECT: Avoid include conflicts for tests
015293bc2e CREATE_PROJECT: Build engines plugins table in tests


Commit: 2fc2ad76a3bdfd21e52be92f397cd7529e3d7ae0
    https://github.com/scummvm/scummvm/commit/2fc2ad76a3bdfd21e52be92f397cd7529e3d7ae0
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Use VcPkg manifests on MSVC >= 17

Changed paths:
    devtools/create_project/msbuild.cpp


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 514c19a9884..294180c71ba 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -363,8 +363,12 @@ void MSBuildProvider::outputGlobalPropFile(const BuildSetup &setup, std::ofstrea
 			   << "\t<PropertyGroup>\n"
 			   << "\t\t<_PropertySheetDisplayName>" << setup.projectDescription << "_Global</_PropertySheetDisplayName>\n"
 			   << "\t\t<OutDir>$(Configuration)" << getMSVCArchName(arch) << "\\</OutDir>\n"
-			   << "\t\t<IntDir>$(Configuration)" << getMSVCArchName(arch) << "\\$(ProjectName)\\</IntDir>\n"
-			   << "\t</PropertyGroup>\n"
+			   << "\t\t<IntDir>$(Configuration)" << getMSVCArchName(arch) << "\\$(ProjectName)\\</IntDir>\n";
+
+	if (_msvcVersion.version >= 17 && setup.useVcpkg)
+		properties << "\t\t<VcpkgEnableManifest>true</VcpkgEnableManifest>\n";
+
+	properties << "\t</PropertyGroup>\n"
 			   << "\t<ItemDefinitionGroup>\n"
 			   << "\t\t<ClCompile>\n"
 			   << "\t\t\t<DisableLanguageExtensions>true</DisableLanguageExtensions>\n"


Commit: 950385eac6f1f65420dcc6eac1615e7bf4755a6c
    https://github.com/scummvm/scummvm/commit/950385eac6f1f65420dcc6eac1615e7bf4755a6c
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Fix paths in pre/post-build commands

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


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 294180c71ba..eb560f9f355 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -319,7 +319,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
 		if (!setup.devTools && !setup.tests && setup.runBuildEvents) {
 			project << "\t\t<PreBuildEvent>\n"
 			        << "\t\t\t<Message>Generate revision</Message>\n"
-			        << "\t\t\t<Command>" << getPreBuildEvent() << "</Command>\n"
+			        << "\t\t\t<Command>" << getPreBuildEvent(setup) << "</Command>\n"
 			        << "\t\t</PreBuildEvent>\n";
 
 			// Copy data files to the build folder
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 79f19c85d26..7ebadae1599 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -249,13 +249,13 @@ void MSVCProvider::createGlobalProp(const BuildSetup &setup) {
 	}
 }
 
-std::string MSVCProvider::getPreBuildEvent() const {
+std::string MSVCProvider::getPreBuildEvent(const BuildSetup &setup) const {
 	std::string cmdLine = "";
 
 	cmdLine = "@echo off\n"
 	          "echo Executing Pre-Build script...\n"
 	          "echo.\n"
-	          "@call "$(SolutionDir)../../devtools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/../.." "$(SolutionDir)"\n"
+	          "@call "$(SolutionDir)" + setup.filePrefix + "/devtools/create_project/scripts/prebuild.cmd" "$(SolutionDir)/" + setup.filePrefix + "" "$(SolutionDir)"\n"
 	          "EXIT /B0";
 
 	return cmdLine;
@@ -268,7 +268,7 @@ std::string MSVCProvider::getTestPreBuildEvent(const BuildSetup &setup) const {
 	for (StringList::const_iterator it = setup.testDirs.begin(); it != setup.testDirs.end(); ++it)
 		target += " $(SolutionDir)" + *it + "*.h";
 
-	return ""$(SolutionDir)../../test/cxxtest/cxxtestgen.py" --runner=ParenPrinter --no-std --no-eh -o "$(SolutionDir)test_runner.cpp"" + target;
+	return ""$(SolutionDir)" + setup.filePrefix + "/test/cxxtest/cxxtestgen.py" --runner=ParenPrinter --no-std --no-eh -o "$(SolutionDir)test_runner.cpp"" + target;
 }
 
 std::string MSVCProvider::getPostBuildEvent(MSVC_Architecture arch, const BuildSetup &setup, bool isRelease) const {
@@ -277,7 +277,7 @@ std::string MSVCProvider::getPostBuildEvent(MSVC_Architecture arch, const BuildS
 	cmdLine = "@echo off\n"
 	          "echo Executing Post-Build script...\n"
 	          "echo.\n"
-	          "@call "$(SolutionDir)../../devtools/create_project/scripts/postbuild.cmd" "$(SolutionDir)/../.." "$(OutDir)" ";
+	          "@call "$(SolutionDir)" + setup.filePrefix + "/devtools/create_project/scripts/postbuild.cmd" "$(SolutionDir)" + setup.filePrefix + "" "$(OutDir)" ";
 
 	cmdLine += setup.getSDLName();
 
diff --git a/devtools/create_project/msvc.h b/devtools/create_project/msvc.h
index d9b4901076a..5266e28b32b 100644
--- a/devtools/create_project/msvc.h
+++ b/devtools/create_project/msvc.h
@@ -100,7 +100,7 @@ protected:
 	/**
 	 * Get the command line for the revision tool (shared between all Visual Studio based providers)
 	 */
-	std::string getPreBuildEvent() const;
+	std::string getPreBuildEvent(const BuildSetup &setup) const;
 
 	/**
 	* Get the command line for the test generator


Commit: 25e5e1722f769db98ce53dfe005992e59442d75c
    https://github.com/scummvm/scummvm/commit/25e5e1722f769db98ce53dfe005992e59442d75c
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CXXTEST: Fix compilation on MSVC

This would give an error C4805: '==': unsafe mix of type 'X' and type 'Y' in operation with X=bool and Y=int

Changed paths:
    test/cxxtest/cxxtest/TestSuite.h


diff --git a/test/cxxtest/cxxtest/TestSuite.h b/test/cxxtest/cxxtest/TestSuite.h
index 79b7cda2e5d..d20d24a974d 100644
--- a/test/cxxtest/cxxtest/TestSuite.h
+++ b/test/cxxtest/cxxtest/TestSuite.h
@@ -47,6 +47,12 @@ namespace CxxTest
         return (x == y);
     }
 
+    template<>
+    bool equals<bool, int>(bool x, int y)
+    {
+        return (x == (bool)y);
+    }
+
     template<class X, class Y>
     void doAssertEquals( const char *file, unsigned line,
                          const char *xExpr, X x,


Commit: 26c023bf1d60062cf3e29853835027fba51e24bf
    https://github.com/scummvm/scummvm/commit/26c023bf1d60062cf3e29853835027fba51e24bf
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Do not use TESTS definition within if blocks

Changed paths:
    devtools/create_project/create_project.cpp


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 21352d182b4..7ff374650f4 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -2393,7 +2393,9 @@ void ProjectProvider::createModuleList(const std::string &moduleDir, const Strin
 				FileList files = listDirectory(folder);
 
 				// Add to list of test folders
-				testDirs.push_back(folder);
+				if (shouldInclude.top()) {
+					testDirs.push_back(folder);
+				}
 
 				for (FileList::const_iterator f = files.begin(); f != files.end(); ++f) {
 					if (f->isDirectory)


Commit: b0e2d1e3baab82ffebcf5c1c7bae5df6d22a9809
    https://github.com/scummvm/scummvm/commit/b0e2d1e3baab82ffebcf5c1c7bae5df6d22a9809
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Fix null_osystem.cpp missing for MSVC tests project

Changed paths:
    devtools/create_project/msbuild.cpp


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index eb560f9f355..2d488ac92b9 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -168,6 +168,7 @@ void MSBuildProvider::createProjectFile(const std::string &name, const std::stri
 	if (setup.tests) {
 		project << "\t<ItemGroup>\n";
 		project << "\t\t<ClCompile Include=\"test_runner.cpp\" />\n";
+		project << "\t\t<ClCompile Include=\"" << setup.srcDir << "/test/null_osystem.cpp\" />\n";
 		project << "\t</ItemGroup>\n";
 	}
 


Commit: ff23782647ddf0155ff4aa1a6a75cf99bb3dbe8c
    https://github.com/scummvm/scummvm/commit/ff23782647ddf0155ff4aa1a6a75cf99bb3dbe8c
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Remove base-backend.cpp from MSVC test project

Changed paths:
    devtools/create_project/msbuild.cpp


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 2d488ac92b9..cac0759e2e0 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -169,6 +169,7 @@ void MSBuildProvider::createProjectFile(const std::string &name, const std::stri
 		project << "\t<ItemGroup>\n";
 		project << "\t\t<ClCompile Include=\"test_runner.cpp\" />\n";
 		project << "\t\t<ClCompile Include=\"" << setup.srcDir << "/test/null_osystem.cpp\" />\n";
+		project << "\t\t<ClCompile Remove=\"" << setup.srcDir << "/backends/base-backend.cpp\" />\n"; // symbols are already defined in null_osystem.cpp
 		project << "\t</ItemGroup>\n";
 	}
 


Commit: e3e6983f7f70af969c275de589b1574f3df5ff68
    https://github.com/scummvm/scummvm/commit/e3e6983f7f70af969c275de589b1574f3df5ff68
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
TEST: Rename directories to conform with other names

MSVC conflicts are fixed in another way.

Changed paths:
  A test/graphics/tinygl_texenv.h
  R test/tgraphics/tinygl_texenv.h
    test/module.mk


diff --git a/test/tgraphics/tinygl_texenv.h b/test/graphics/tinygl_texenv.h
similarity index 100%
rename from test/tgraphics/tinygl_texenv.h
rename to test/graphics/tinygl_texenv.h
diff --git a/test/module.mk b/test/module.mk
index 48926845f2b..e2fd4a61ff3 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -29,7 +29,7 @@ TEST_LIBS += test/null_osystem.o \
 endif
 
 ifdef USE_TINYGL
-TESTS += $(srcdir)/test/tgraphics/tinygl*.h
+TESTS += $(srcdir)/test/graphics/tinygl*.h
 endif
 
 TEST_LIBS +=	audio/libaudio.a math/libmath.a common/formats/libformats.a common/compression/libcompression.a common/libcommon.a image/libimage.a graphics/libgraphics.a


Commit: ec7e4a9d79973eb5fd8ac179c199f970a334071f
    https://github.com/scummvm/scummvm/commit/ec7e4a9d79973eb5fd8ac179c199f970a334071f
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Fix encoding.dat not being copied for MSVC tests project

Changed paths:
    devtools/create_project/msbuild.cpp


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index cac0759e2e0..38658e19ef9 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -188,6 +188,7 @@ void MSBuildProvider::createProjectFile(const std::string &name, const std::stri
 		// We override the normal target to ignore the exit code (this allows us to have a clean output and not message about the command exit code)
 		project << "\t\t<Target Name=\"PostBuildEvent\">\n"
 		        << "\t\t\t<Message Text=\"Description: Run tests\" />\n"
+		        << "\t\t\t<Copy SourceFiles=\"" + setup.filePrefix + "/dists/engine-data/encoding.dat\" DestinationFolder=\"$(ProjectDir)test/engine-data\" SkipUnchangedFiles=\"true\" />\n"
 		        << "\t\t\t<Exec Command=\"$(TargetPath)\"  IgnoreExitCode=\"true\" />\n"
 		        << "\t\t</Target>\n";
 	}


Commit: 7199f2571ad0e91272b0249d0292f10c227a2e0d
    https://github.com/scummvm/scummvm/commit/7199f2571ad0e91272b0249d0292f10c227a2e0d
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
MATH: Fix deg2rad test compilation for MSVC

Changed paths:
    math/utils.h


diff --git a/math/utils.h b/math/utils.h
index 9ed89d86a6c..b41956dd418 100644
--- a/math/utils.h
+++ b/math/utils.h
@@ -92,9 +92,9 @@ inline OutputT deg2rad(InputT deg) {
 }
 
 // Handle the case differently when the input type is double
-template<class OutputT>
-inline OutputT deg2rad(double deg) {
-	return (OutputT)( deg * 0.0174532925199433);
+template<>
+inline double deg2rad<double, double>(double deg) {
+	return ( deg * 0.0174532925199433);
 }
 
 // Convert degrees to radians


Commit: c534a138e02b60f2b6ebdc9f6208e5860b2375b4
    https://github.com/scummvm/scummvm/commit/c534a138e02b60f2b6ebdc9f6208e5860b2375b4
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
MATH: Use floats where appropriate

Changed paths:
    test/math/ray.h
    test/math/vector3d.h


diff --git a/test/math/ray.h b/test/math/ray.h
index 5345583d0f3..87bd05a1dbc 100644
--- a/test/math/ray.h
+++ b/test/math/ray.h
@@ -25,7 +25,7 @@ public:
 		Math::Vector3d d(0, 1, 2);
 		Math::Ray r(o, d);
 
-		r.translate(Math::Vector3d(0.5, 0.2, 0.1));
+		r.translate(Math::Vector3d(0.5f, 0.2f, 0.1f));
 		TS_ASSERT(r.getDirection() == d);
 		Math::Vector3d o2 = r.getOrigin();
 
@@ -42,7 +42,7 @@ public:
 		const Math::Vector3d v3(0, 10, 20);
 
 		// A ray that points along the x axis, should hit the triangle at the origin
-		Math::Ray r(Math::Vector3d(-9.5, 0, 0.7), Math::Vector3d(1, 0, 0));
+		Math::Ray r(Math::Vector3d(-9.5f, 0, 0.7f), Math::Vector3d(1, 0, 0));
 
 		Math::Vector3d loc(7, 8, 9); // add values to ensure it's changed
 		float dist = 99.0f;
diff --git a/test/math/vector3d.h b/test/math/vector3d.h
index 2dcf484b9d3..ff9d840f34a 100644
--- a/test/math/vector3d.h
+++ b/test/math/vector3d.h
@@ -60,7 +60,7 @@ public:
 		Math::Vector3d v1(1, 0, 2);
 		Math::Vector3d v2(0, 5, 3);
 
-		Math::Vector3d int1 = Math::Vector3d::interpolate(v1, v2, 0.1);
+		Math::Vector3d int1 = Math::Vector3d::interpolate(v1, v2, 0.1f);
 		TS_ASSERT_DELTA(int1.x(), 0.9, 0.0001);
 		TS_ASSERT_DELTA(int1.y(), 0.5, 0.0001);
 		TS_ASSERT_DELTA(int1.z(), 2.1, 0.0001);


Commit: 87fba6a3953a5f433874c96cb7fc8f0ccddaa70a
    https://github.com/scummvm/scummvm/commit/87fba6a3953a5f433874c96cb7fc8f0ccddaa70a
Author: Helco (hermann.noll at hotmail.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Keep components for test project enabled

Changed paths:
    devtools/create_project/create_project.cpp


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 7ff374650f4..e36ea407868 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -401,7 +401,8 @@ int main(int argc, char *argv[]) {
 	}
 
 	// Disable unused features / components
-	disableComponents(setup.components);
+	if (!setup.tests)
+		disableComponents(setup.components);
 
 	// Handle hard-coded component logic
 	fixupComponents(setup);


Commit: 0798cc7c9212b083239ed7b370e87bbe80b5eac2
    https://github.com/scummvm/scummvm/commit/0798cc7c9212b083239ed7b370e87bbe80b5eac2
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Fix cxxtestgen.py invocation

Changed paths:
    devtools/create_project/msvc.cpp


diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 7ebadae1599..08e9bb2b923 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -268,7 +268,7 @@ std::string MSVCProvider::getTestPreBuildEvent(const BuildSetup &setup) const {
 	for (StringList::const_iterator it = setup.testDirs.begin(); it != setup.testDirs.end(); ++it)
 		target += " $(SolutionDir)" + *it + "*.h";
 
-	return ""$(SolutionDir)" + setup.filePrefix + "/test/cxxtest/cxxtestgen.py" --runner=ParenPrinter --no-std --no-eh -o "$(SolutionDir)test_runner.cpp"" + target;
+	return "python3 "$(SolutionDir)" + setup.filePrefix + "/test/cxxtest/cxxtestgen.py" --runner=ParenPrinter --no-std --no-eh -o "$(SolutionDir)test_runner.cpp"" + target;
 }
 
 std::string MSVCProvider::getPostBuildEvent(MSVC_Architecture arch, const BuildSetup &setup, bool isRelease) const {


Commit: 1aad68f13cf91c3fc643895c86ae8090b936bd05
    https://github.com/scummvm/scummvm/commit/1aad68f13cf91c3fc643895c86ae8090b936bd05
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Avoid include conflicts for tests

Move test runner null OSystem implementation in subfolders.

MSVC resolves relative includes using the including file but also the
including parents. This leads to clashes when including the code under
test from the runner or the null system code.

By moving everything inside their own folder, the clash is avoided as
relative paths don't resolve anymore from there.

Changed paths:
  A test/system/null_osystem.cpp
  A test/system/null_osystem.h
  R test/null_osystem.cpp
  R test/null_osystem.h
    devtools/create_project/msbuild.cpp
    devtools/create_project/msvc.cpp
    test/common/encoding.h
    test/image/blending.h
    test/module.mk


diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index 38658e19ef9..bf649369bd1 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -167,8 +167,8 @@ void MSBuildProvider::createProjectFile(const std::string &name, const std::stri
 	// Output auto-generated test runner
 	if (setup.tests) {
 		project << "\t<ItemGroup>\n";
-		project << "\t\t<ClCompile Include=\"test_runner.cpp\" />\n";
-		project << "\t\t<ClCompile Include=\"" << setup.srcDir << "/test/null_osystem.cpp\" />\n";
+		project << "\t\t<ClCompile Include=\"test/runner/test_runner.cpp\" />\n";
+		project << "\t\t<ClCompile Include=\"" << setup.srcDir << "/test/system/null_osystem.cpp\" />\n";
 		project << "\t\t<ClCompile Remove=\"" << setup.srcDir << "/backends/base-backend.cpp\" />\n"; // symbols are already defined in null_osystem.cpp
 		project << "\t</ItemGroup>\n";
 	}
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 08e9bb2b923..c6d810673c1 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -268,7 +268,10 @@ std::string MSVCProvider::getTestPreBuildEvent(const BuildSetup &setup) const {
 	for (StringList::const_iterator it = setup.testDirs.begin(); it != setup.testDirs.end(); ++it)
 		target += " $(SolutionDir)" + *it + "*.h";
 
-	return "python3 "$(SolutionDir)" + setup.filePrefix + "/test/cxxtest/cxxtestgen.py" --runner=ParenPrinter --no-std --no-eh -o "$(SolutionDir)test_runner.cpp"" + target;
+	std::string cmdLine = "";
+	cmdLine = "if not exist \"$(SolutionDir)test\\runner\" mkdir \"$(SolutionDir)test\\runner\"\n"
+	          "python3 "$(SolutionDir)" + setup.filePrefix + "/test/cxxtest/cxxtestgen.py" --runner=ParenPrinter --no-std --no-eh -o "$(SolutionDir)test/runner/test_runner.cpp"" + target;
+	return cmdLine;
 }
 
 std::string MSVCProvider::getPostBuildEvent(MSVC_Architecture arch, const BuildSetup &setup, bool isRelease) const {
diff --git a/test/common/encoding.h b/test/common/encoding.h
index f986360f960..15a5a16b0e1 100644
--- a/test/common/encoding.h
+++ b/test/common/encoding.h
@@ -2,7 +2,7 @@
 
 #include "common/str.h"
 #include "common/ustr.h"
-#include "../null_osystem.h"
+#include "../system/null_osystem.h"
 
 // We support CJK on all the platforms but it relies on OSystem to read
 // file which *in test environments* is available only on some platforms
diff --git a/test/image/blending.h b/test/image/blending.h
index 40bbe9bdac7..5daa2e3f40f 100644
--- a/test/image/blending.h
+++ b/test/image/blending.h
@@ -42,7 +42,7 @@
 #include "graphics/primitives.h"
 #include "graphics/transform_tools.h"
 
-#include "../null_osystem.h"
+#include "../system/null_osystem.h"
 
 #if NULL_OSYSTEM_IS_AVAILABLE
 #define BENCHMARK_TIME 1
diff --git a/test/module.mk b/test/module.mk
index e2fd4a61ff3..848d2e5466a 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -9,7 +9,7 @@ TESTS        := $(srcdir)/test/common/*.h $(srcdir)/test/common/formats/*.h $(sr
 TEST_LIBS    :=
 
 ifdef POSIX
-TEST_LIBS += test/null_osystem.o \
+TEST_LIBS += test/system/null_osystem.o \
 	backends/fs/posix/posix-fs-factory.o \
 	backends/fs/posix/posix-fs.o \
 	backends/fs/posix/posix-iostream.o \
@@ -19,7 +19,7 @@ TEST_LIBS += test/null_osystem.o \
 endif
 
 ifdef WIN32
-TEST_LIBS += test/null_osystem.o \
+TEST_LIBS += test/system/null_osystem.o \
 	backends/fs/windows/windows-fs-factory.o \
 	backends/fs/windows/windows-fs.o \
 	backends/fs/abstract-fs.o \
@@ -90,7 +90,7 @@ test/runner.cpp: $(TESTS) $(srcdir)/test/module.mk
 
 clean: clean-test
 clean-test:
-	-$(RM) test/runner.cpp test/runner test/engine-data/encoding.dat test/null_osystem.o
+	-$(RM) test/runner.cpp test/runner test/engine-data/encoding.dat test/system/null_osystem.o
 	-rmdir test/engine-data
 
 test/engine-data/encoding.dat: $(srcdir)/dists/engine-data/encoding.dat
diff --git a/test/null_osystem.cpp b/test/system/null_osystem.cpp
similarity index 100%
rename from test/null_osystem.cpp
rename to test/system/null_osystem.cpp
diff --git a/test/null_osystem.h b/test/system/null_osystem.h
similarity index 100%
rename from test/null_osystem.h
rename to test/system/null_osystem.h


Commit: 015293bc2e2c2cc84bc370bbf569c4289f5ad71d
    https://github.com/scummvm/scummvm/commit/015293bc2e2c2cc84bc370bbf569c4289f5ad71d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-11-02T15:27:28+01:00

Commit Message:
CREATE_PROJECT: Build engines plugins table in tests

This is needed to finish the build.

Changed paths:
    devtools/create_project/create_project.cpp


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index e36ea407868..5995abe3f98 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -2017,7 +2017,7 @@ void ProjectProvider::createProject(BuildSetup &setup) {
 
 	// In case we create the main ScummVM project files we will need to
 	// generate engines/plugins_table.h & engines/detection_table.h
-	if (!setup.tests && !setup.devTools) {
+	if (!setup.devTools) {
 		createEnginePluginsTable(setup);
 	}
 }

More information about the Scummvm-git-logs mailing list