Fix vec3_cross. Added optimization to Makefile since we've been compiling gmqcc witho...

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 3097368802bca32cf61b1835241ca93bb2d5cbad..6f8eb9a82732f86b3ebc2619a6ec461eb3fe819b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +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
+CFLAGS += -Wall -Wextra -Werror -Wstrict-aliasing -Wno-attributes -O3
 #turn on tons of warnings if clang is present
 # but also turn off the STUPID ONES
 ifeq ($(CC), clang)
@@ -17,6 +17,7 @@ ifeq ($(CC), clang)
            -Wno-float-equal                   \
            -Wno-unknown-warning-option        \
            -Wno-cast-align                    \
+           -Wno-assign-enum                   \
            -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