X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=Makefile;h=207e910471305915fb31ab020c3f1ef633e26185;hp=3097368802bca32cf61b1835241ca93bb2d5cbad;hb=b08195e2da48e041a4f027d93e944bc4715169ec;hpb=103bca7284dfee62c62c670fd1be9b7929581c5e

diff --git a/Makefile b/Makefile
index 3097368..207e910 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,8 @@ ifeq ($(CC), clang)
 	    -Wno-float-equal                   \
 	    -Wno-unknown-warning-option        \
 	    -Wno-cast-align                    \
+	    -Wno-assign-enum                   \
+	    -Wno-empty-body                    \
 	    -pedantic-errors
 else
 	ifneq ($(CC), g++)
@@ -40,7 +41,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