[Scummvm-git-logs] scummvm master -> a52e5818d27dba7dca8b902370f6d39c787faa5e
SupSuper
supsuper at gmail.com
Mon Feb 22 12:29:28 UTC 2021
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c3ee9dec51 MSVC: Use new lib names for tests and tools
9401ef1a82 CREATE_PROJECT: Don't include detection in tests/tools
eeda14b170 CREATE_PROJECT: Fix incorrect text filenames
73755d1d3a CREATE_PROJECT: Fix infinite loop when generating tests
a52e5818d2 CREATE_PROJECT: Use console for devtools and tests projects
Commit: c3ee9dec51cafc75c51554ab35f6fb5170efde8e
https://github.com/scummvm/scummvm/commit/c3ee9dec51cafc75c51554ab35f6fb5170efde8e
Author: SupSuper (supsuper at gmail.com)
Date: 2021-02-22T12:01:47Z
Commit Message:
MSVC: Use new lib names for tests and tools
Changed paths:
dists/msvc/create_msvc.bat
diff --git a/dists/msvc/create_msvc.bat b/dists/msvc/create_msvc.bat
index 19313f8007..331b7b108e 100644
--- a/dists/msvc/create_msvc.bat
+++ b/dists/msvc/create_msvc.bat
@@ -69,14 +69,14 @@ goto done
echo.
echo Creating tools project files
echo.
-create_project ..\.. --tools --msvc
+create_project ..\.. --tools --use-canonical-lib-names --msvc
goto done
:tests
echo.
echo Creating tests project files
echo.
-create_project ..\.. --tests --msvc
+create_project ..\.. --tests --use-canonical-lib-names --msvc
goto done
:clean_check
Commit: 9401ef1a8283a0ea8452d3b9473dc21f63a309aa
https://github.com/scummvm/scummvm/commit/9401ef1a8283a0ea8452d3b9473dc21f63a309aa
Author: SupSuper (supsuper at gmail.com)
Date: 2021-02-22T12:10:11Z
Commit Message:
CREATE_PROJECT: Don't include detection in tests/tools
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 d97d60d79d..d6243fbee2 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -297,11 +297,14 @@ int main(int argc, char *argv[]) {
// When building tests, disable some features
if (setup.tests) {
+ setup.useStaticDetection = false;
setFeatureBuildState("mt32emu", setup.features, false);
setFeatureBuildState("eventrecorder", setup.features, false);
for (EngineDescList::iterator j = setup.engines.begin(); j != setup.engines.end(); ++j)
j->enable = false;
+ } else if (setup.devTools) {
+ setup.useStaticDetection = false;
}
// HACK: Vorbis and Tremor can not be enabled simultaneously
Commit: eeda14b1700fe10c05dc775f64ecae30455201df
https://github.com/scummvm/scummvm/commit/eeda14b1700fe10c05dc775f64ecae30455201df
Author: SupSuper (supsuper at gmail.com)
Date: 2021-02-22T12:18:45Z
Commit Message:
CREATE_PROJECT: Fix incorrect text filenames
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 d6243fbee2..b337d5e5ad 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1574,22 +1574,7 @@ void ProjectProvider::createProject(BuildSetup &setup) {
createProjectFile(detProject, detUUID, setup, setup.srcDir + "/engines", in, ex);
}
- if (setup.tests) {
- // Create the main project file.
- in.clear();
- ex.clear();
- createModuleList(setup.srcDir + "/backends", setup.defines, setup.testDirs, in, ex);
- createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, setup.testDirs, in, ex);
- createModuleList(setup.srcDir + "/base", setup.defines, setup.testDirs, in, ex);
- createModuleList(setup.srcDir + "/common", setup.defines, setup.testDirs, in, ex);
- createModuleList(setup.srcDir + "/engines", setup.defines, setup.testDirs, in, ex);
- createModuleList(setup.srcDir + "/graphics", setup.defines, setup.testDirs, in, ex);
- createModuleList(setup.srcDir + "/gui", setup.defines, setup.testDirs, in, ex);
- createModuleList(setup.srcDir + "/audio", setup.defines, setup.testDirs, in, ex);
- createModuleList(setup.srcDir + "/test", setup.defines, setup.testDirs, in, ex);
-
- createProjectFile(setup.projectName, svmUUID, setup, setup.srcDir, in, ex);
- } else if (!setup.devTools) {
+ if (!setup.devTools) {
// Last but not least create the main project file.
in.clear();
ex.clear();
@@ -1606,21 +1591,27 @@ void ProjectProvider::createProject(BuildSetup &setup) {
createModuleList(setup.srcDir + "/video", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/image", setup.defines, setup.testDirs, in, ex);
createModuleList(setup.srcDir + "/math", setup.defines, setup.testDirs, in, ex);
-
- // Resource files
- addResourceFiles(setup, in, ex);
-
- // Various text files
- in.push_back(setup.srcDir + "/AUTHORS");
- in.push_back(setup.srcDir + "/COPYING");
- in.push_back(setup.srcDir + "/COPYING.LGPL");
- in.push_back(setup.srcDir + "/COPYING.BSD");
- in.push_back(setup.srcDir + "/COPYING.FREEFONT");
- in.push_back(setup.srcDir + "/COPYING.OFL");
- in.push_back(setup.srcDir + "/COPYRIGHT");
- in.push_back(setup.srcDir + "/NEWS");
- in.push_back(setup.srcDir + "/README");
- in.push_back(setup.srcDir + "/TODO");
+ if (setup.tests) {
+ createModuleList(setup.srcDir + "/test", setup.defines, setup.testDirs, in, ex);
+ } else {
+ // Resource files
+ addResourceFiles(setup, in, ex);
+
+ // Various text files
+ in.push_back(setup.srcDir + "/AUTHORS");
+ in.push_back(setup.srcDir + "/COPYING");
+ in.push_back(setup.srcDir + "/COPYING.BSD");
+ in.push_back(setup.srcDir + "/COPYING.FREEFONT");
+ in.push_back(setup.srcDir + "/COPYING.ISC");
+ in.push_back(setup.srcDir + "/COPYING.LGPL");
+ in.push_back(setup.srcDir + "/COPYING.LUA");
+ in.push_back(setup.srcDir + "/COPYING.MIT");
+ in.push_back(setup.srcDir + "/COPYING.OFL");
+ in.push_back(setup.srcDir + "/COPYING.TINYGL");
+ in.push_back(setup.srcDir + "/COPYRIGHT");
+ in.push_back(setup.srcDir + "/NEWS.md");
+ in.push_back(setup.srcDir + "/README.md");
+ }
// Create the main project file.
createProjectFile(setup.projectName, svmUUID, setup, setup.srcDir, in, ex);
Commit: 73755d1d3ad1c9b8d1828e2ebe58a59fd6cef9d4
https://github.com/scummvm/scummvm/commit/73755d1d3ad1c9b8d1828e2ebe58a59fd6cef9d4
Author: SupSuper (supsuper at gmail.com)
Date: 2021-02-22T12:22:47Z
Commit Message:
CREATE_PROJECT: Fix infinite loop when generating tests
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 b337d5e5ad..1552d06c3d 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1932,9 +1932,6 @@ void ProjectProvider::createModuleList(const std::string &moduleDir, const Strin
// Scan all files in the include folder
FileList files = listDirectory(folder);
- if (files.empty())
- continue;
-
// Add to list of test folders
testDirs.push_back(folder);
Commit: a52e5818d27dba7dca8b902370f6d39c787faa5e
https://github.com/scummvm/scummvm/commit/a52e5818d27dba7dca8b902370f6d39c787faa5e
Author: SupSuper (supsuper at gmail.com)
Date: 2021-02-22T12:28:54Z
Commit Message:
CREATE_PROJECT: Use console for devtools and tests projects
Changed paths:
devtools/create_project/msbuild.cpp
devtools/create_project/visualstudio.cpp
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index fcb3696656..f71c2370a8 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -384,7 +384,7 @@ 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")) {
+ if (!setup.featureEnabled("text-console") && !setup.devTools && !setup.tests) {
properties << "\t\t\t<SubSystem>Windows</SubSystem>\n";
} else {
properties << "\t\t\t<SubSystem>Console</SubSystem>\n";
diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index 64bb134e32..fa67b025ab 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -232,7 +232,7 @@ void VisualStudioProvider::outputGlobalPropFile(const BuildSetup &setup, std::of
<< "\t<Tool\n"
<< "\t\tName=\"VCLinkerTool\"\n"
<< "\t\tIgnoreDefaultLibraryNames=\"\"\n";
- if (setup.featureEnabled("text-console")) {
+ if (setup.featureEnabled("text-console") || setup.devTools || setup.tests) {
properties << "\t\tSubSystem=\"1\"\n";
} else {
properties << "\t\tSubSystem=\"2\"\n";
More information about the Scummvm-git-logs
mailing list