From 7ca4e2ea5d9fd1bffc37a3860baacddd067c3f3f Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Tue, 1 Aug 2017 18:39:42 +0200 Subject: [PATCH] Revert "Pass -Wno-misleading-indentation to silence spurious warnings." Clang 4.0 doesn't like this and I'm too lazy to implement per compiler CFLAGS. --- CMakeLists.txt | 2 +- Makefile | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2b4b93a..8d4f17b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ list(APPEND CMAKE_PREFIX_PATH /usr/local) # -Wall -> More warnings # -fno-strict-aliasing -> Quake 2 is far away from strict aliasing # -fwrapv -> Make signed integer overflows defined -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wno-misleading-indentation -fno-strict-aliasing -fwrapv") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -fno-strict-aliasing -fwrapv") # Use -O2 as maximum optimization level. -O3 has it's problems with yquake2. string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") diff --git a/Makefile b/Makefile index 4e1e2de2..b0e704d7 100755 --- a/Makefile +++ b/Makefile @@ -157,12 +157,11 @@ endif # generated if building universal binaries on OSX) ifeq ($(YQ2_OSTYPE), Darwin) CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ - -Wall -Wno-misleading-indentation -pipe -g -fwrapv + -Wall -pipe -g -fwrapv CFLAGS += $(OSX_ARCH) else -CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing -Wall \ - -Wno-misleading-indentation -pipe -g -ggdb \ - -MMD -fwrapv +CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \ + -Wall -pipe -g -ggdb -MMD -fwrapv endif # ----------