[Scummvm-git-logs] scummvm master -> 2bde24c712059e21b05c4e467f789be9cbb9112c

[sev-]

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:
cc2e31a2b3 DIRECTOR: Simplify expression
2bde24c712 BUILD: Use new MSVC lib names by default


Commit: cc2e31a2b34fe6bbd2c43fa7ee618b13b30ac5f0
    https://github.com/scummvm/scummvm/commit/cc2e31a2b34fe6bbd2c43fa7ee618b13b30ac5f0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-22T10:38:06+02:00

Commit Message:
DIRECTOR: Simplify expression

Changed paths:
    engines/director/lingo/lingo-code.cpp


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 02c1cef86b..58181d4565 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -902,7 +902,7 @@ Datum LC::chunkRef(ChunkType type, int startChunk, int endChunk, const Datum &sr
 		break;
 	case kChunkItem:
 		skipChars = "";
-		breakChars = Common::String::format("%c", g_lingo->_itemDelimiter);
+		breakChars = g_lingo->_itemDelimiter;
 		break;
 	case kChunkLine:
 		skipChars = "";


Commit: 2bde24c712059e21b05c4e467f789be9cbb9112c
    https://github.com/scummvm/scummvm/commit/2bde24c712059e21b05c4e467f789be9cbb9112c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-22T10:45:00+02:00

Commit Message:
BUILD: Use new MSVC lib names by default

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index e95ad9cf7f..035de4cc57 100644
--- a/ports.mk
+++ b/ports.mk
@@ -501,7 +501,7 @@ endif
 	@echo Creating Code::Blocks project files...
 	@cd $(srcdir)/dists/codeblocks && ../../devtools/create_project/create_project ../.. --codeblocks >/dev/null && git add -f engines/plugins_table.h *.workspace *.cbp
 	@echo Creating MSVC project files...
-	@cd $(srcdir)/dists/msvc && ../../devtools/create_project/create_project ../.. --msvc-version 12 --msvc >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props
+	@cd $(srcdir)/dists/msvc && ../../devtools/create_project/create_project ../.. --use-canonical-lib-names --msvc-version 12 --msvc >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props
 	@echo
 	@echo All is done.
 	@echo Now run