Merge branch 'portable' into travisCIv2

This commit is contained in:
Clownacy 2019-11-02 20:20:17 +00:00 committed by GitHub
commit 1d005fcb8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -47,7 +47,7 @@ ifeq ($(WARNINGS), 1)
CXXFLAGS += -Wall -Wextra -pedantic CXXFLAGS += -Wall -Wextra -pedantic
endif endif
ifeq ($(ALL_WARNINGS), 1) ifeq ($(WARNINGS_ALL), 1)
ifneq ($(findstring clang,$(CXX)),) ifneq ($(findstring clang,$(CXX)),)
# Use clang-specific flag -Weverything # Use clang-specific flag -Weverything
CXXFLAGS += -Weverything CXXFLAGS += -Weverything
@ -57,7 +57,7 @@ ifeq ($(ALL_WARNINGS), 1)
endif endif
endif endif
ifeq ($(FATAL_WARNINGS), 1) ifeq ($(WARNINGS_FATAL), 1)
CXXFLAGS += -Werror CXXFLAGS += -Werror
endif endif