yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-29 15:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Pass -Wno-misleading-indentation to silence spurious warnings."

Browse source 
Clang 4.0 doesn't like this and I'm too lazy to implement per compiler
CFLAGS.
This commit is contained in:
Yamagi Burmeister 2017-08-01 18:39:42 +02:00
parent 86fd714788
commit 7ca4e2ea5d
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -31,7 +31,7 @@ list(APPEND CMAKE_PREFIX_PATH /usr/local)
# -Wall -> More warnings # -Wall -> More warnings
# -fno-strict-aliasing -> Quake 2 is far away from strict aliasing # -fno-strict-aliasing -> Quake 2 is far away from strict aliasing
# -fwrapv -> Make signed integer overflows defined # -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. # 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}") string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")

7
Makefile
View file

@ -157,12 +157,11 @@ endif
# generated if building universal binaries on OSX) # generated if building universal binaries on OSX)
ifeq ($(YQ2_OSTYPE), Darwin) ifeq ($(YQ2_OSTYPE), Darwin)
CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \ CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
-Wall -Wno-misleading-indentation -pipe -g -fwrapv -Wall -pipe -g -fwrapv
CFLAGS += $(OSX_ARCH) CFLAGS += $(OSX_ARCH)
else else
CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing -Wall \ CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \
-Wno-misleading-indentation -pipe -g -ggdb \ -Wall -pipe -g -ggdb -MMD -fwrapv
-MMD -fwrapv
endif endif
# ---------- # ----------