Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CONFIGURE: Add -fno-operator-names for clang/gcc #2246

Merged
merged 2 commits into from Jun 18, 2020
+4 −3
Merged

CONFIGURE: Add -fno-operator-names for clang/gcc #2246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99847fe
CONFIGURE: Add -fno-operator-names for clang/gcc
mduggan May 12, 2020
a3c977d
WINTERMUTE: Remove use of 'not' operator
mduggan May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions configure
View file
Open in desktop
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions engines/wintermute/wintermute.cpp
View file
Open in desktop
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down