X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=530bd4cd4ea42249b3315b14951ec65724b3e56a;hb=e922403aa8658c95e1c7fd369f75ce508e5aea7b;hp=3097368802bca32cf61b1835241ca93bb2d5cbad;hpb=103bca7284dfee62c62c670fd1be9b7929581c5e;p=xonotic%2Fgmqcc.git diff --git a/Makefile b/Makefile index 3097368..530bd4c 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,10 @@ include include.mk UNAME ?= $(shell uname) -CYGWIN = $(findstring CYGWIN, $(UNAME)) -MINGW = $(findstring MINGW32, $(UNAME)) +CYGWIN = $(findstring CYGWIN, $(UNAME)) +MINGW = $(findstring MINGW, $(UNAME)) -CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing -Wno-attributes -#turn on tons of warnings if clang is present +# turn on tons of warnings if clang is present # but also turn off the STUPID ONES ifeq ($(CC), clang) CFLAGS += \ @@ -17,6 +16,9 @@ ifeq ($(CC), clang) -Wno-float-equal \ -Wno-unknown-warning-option \ -Wno-cast-align \ + -Wno-assign-enum \ + -Wno-empty-body \ + -Wno-date-time \ -pedantic-errors else ifneq ($(CC), g++) @@ -40,7 +42,8 @@ endif # do this last otherwise there is whitespace in the command output and # it makes my OCD act up -CFLAGS += $(OPTIONAL) +CFLAGS += $(OPTIONAL_CFLAGS) +LDFLAGS += $(OPTIONAL_LDFLAGS) #we have duplicate object files when dealing with creating a simple list #for dependinces. To combat this we use some clever recrusive-make to