Merge branch 'master' into blub/bc3

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 9d1faf52202a644454afe96c6f297013e7fe60eb..d326576da571977ee15a368ff4ab61b2f637f2b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,58 @@
-CC      = gcc
-CFLAGS += -Wall
-OBJ     = main.o      \
-          lex.o       \
-          error.o     \
-          parse.o     \
-          typedef.o   \
+CC     ?= clang
+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      \
-          assembler.c
+          ast.o       \
+          ir.o
+OBJ_A = test/ast-test.o
+OBJ_I = test/ir-test.o
+OBJ_C = main.o lexer.o parser.o
+OBJ_X = exec-standalone.o util.o
 
+#default is compiler only
+default: gmqcc
 %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)
 
-gmqcc: $(OBJ)
+exec-standalone.o: exec.c
+       $(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
+
+# test targets
+test_ast: $(OBJ_A) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
-       
+test_ir:  $(OBJ_I) $(OBJ)
+       $(CC) -o $@ $^ $(CFLAGS)
+qcvm:     $(OBJ_X)
+       $(CC) -o $@ $^ $(CFLAGS)
+exec.o: execloop.h
+exec-standalone.o: execloop.h
+test: test_ast test_ir
+
+# compiler target
+gmqcc: $(OBJ_C) $(OBJ)
+       $(CC) -o $@ $^ $(CFLAGS)
+
+#all target is test and all
+all: test gmqcc
+
 clean:
-       rm -f *.o gmqcc
+       rm -f *.o gmqcc qcvm test_ast test_ir test/*.o
+       
+