Merge branch 'master' into blub/bc3

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 7c332105fe06e7ca708a981af3f930834cf11ac7..9101d2b12a3600ae8e410e3b8ea8d31decdcd8de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,29 @@
 CC     ?= clang
-CFLAGS += -Wall -I. -pedantic-errors -std=c90 -Wno-attributes
-OBJ     = lex.o       \
-          error.o     \
-          parse.o     \
-          typedef.o   \
+CFLAGS += -Wall -I. -pedantic-errors -std=c90
+
+#turn on tons of warnings if clang is present
+ifeq ($(CC), clang)
+       CFLAGS +=                  \
+               -Weverything                  \
+               -Wno-missing-prototypes       \
+               -Wno-unused-parameter         \
+               -Wno-sign-compare             \
+               -Wno-implicit-fallthrough     \
+               -Wno-sign-conversion          \
+               -Wno-conversion               \
+               -Wno-disabled-macro-expansion \
+               -Wno-padded                   \
+               -Wno-format-nonliteral
+
+endif
+OBJ     = \
           util.o      \
           code.o      \
-          asm.o       \
           ast.o       \
-          ir.o 
+          ir.o
 OBJ_A = test/ast-test.o
 OBJ_I = test/ir-test.o
-OBJ_C = main.o
+OBJ_C = main.o lexer.o parser.o
 
 #default is compiler only
 default: gmqcc
@@ -34,3 +46,5 @@ all: test gmqcc
 
 clean:
        rm -f *.o gmqcc test_ast test_ir test/*.o
+       
+