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

[digitall]

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:
a4aaeed79d CONFIGURE: Add -fno-operator-names for clang/gcc
d66b771511 WINTERMUTE: Remove use of 'not' operator


Commit: a4aaeed79d1a94d5472a0853184e805486aee489
    https://github.com/scummvm/scummvm/commit/a4aaeed79d1a94d5472a0853184e805486aee489
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-06-18T23:47:02+01:00

Commit Message:
CONFIGURE: Add -fno-operator-names for clang/gcc

The use of operator names works fine on gcc and clang, but breaks MSVC.  Make
them error on gcc/clang too.

According to this random link, gcc and clang have supported this flag for a
really long time, so it shouldn't need an extra compile check:
https://phabricator.kde.org/D3850

Changed paths:
    configure


diff --git a/configure b/configure
index d785f37836..fae3305788 100755
--- a/configure
+++ b/configure
@@ -2275,6 +2275,7 @@ if test "$have_gcc" = yes ; then
 	else
 		append_var CXXFLAGS "-Wconversion"
 	fi;
+	append_var CXXFLAGS "-fno-operator-names"
 elif test "$have_icc" = yes ; then
 	add_line_to_config_mk 'CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP'
 fi;


Commit: d66b771511f33049f5bd995b19faa03df629e905
    https://github.com/scummvm/scummvm/commit/d66b771511f33049f5bd995b19faa03df629e905
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-06-18T23:47:02+01:00

Commit Message:
WINTERMUTE: Remove use of 'not' operator

Changed paths:
    engines/wintermute/wintermute.cpp


diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 002f2af109..2ca21495fb 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -161,7 +161,7 @@ int WintermuteEngine::init() {
 	}
 
 	// check dependencies for games with high resolution assets
-	#if not defined(USE_PNG) || not defined(USE_JPEG) || not defined(USE_VORBIS)
+	#if !defined(USE_PNG) || !defined(USE_JPEG) || !defined(USE_VORBIS)
 		if (!(instance.getFlags() & GF_LOWSPEC_ASSETS)) {
 			GUI::MessageDialog dialog(_("This game requires PNG, JPEG and Vorbis support."));
 			dialog.runModal();
@@ -172,7 +172,7 @@ int WintermuteEngine::init() {
 	#endif
 
 	// check dependencies for games with FoxTail subengine
-	#if not defined(ENABLE_FOXTAIL)
+	#if !defined(ENABLE_FOXTAIL)
 		if (BaseEngine::isFoxTailCheck(instance.getTargetExecutable())) {
 			GUI::MessageDialog dialog(_("This game requires the FoxTail subengine, which is not compiled in."));
 			dialog.runModal();
@@ -183,7 +183,7 @@ int WintermuteEngine::init() {
 	#endif
 
 	// check dependencies for games with HeroCraft subengine
-	#if not defined(ENABLE_HEROCRAFT)
+	#if !defined(ENABLE_HEROCRAFT)
 		if (instance.getTargetExecutable() == WME_HEROCRAFT) {
 			GUI::MessageDialog dialog(_("This game requires the HeroCraft subengine, which is not compiled in."));
 			dialog.runModal();