Merging in new-syntax

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 949c42abff0d4eb3d114633157c24101142147a3..ce0bc8697702db02caf715af8c13360dfa3dd5d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,61 @@
 CC     ?= clang
-CFLAGS += -Wall -I. -pedantic-errors -std=c90 -Wno-attributes
-OBJ     = lex.o       \
-          error.o     \
-          parse.o     \
-          typedef.o   \
+CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector
+#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
+ifeq ($(track), no)
+    CFLAGS += -DNOTRACK
+endif
+
+OBJ     = \
           util.o      \
           code.o      \
-          asm.o       \
           ast.o       \
-          ir.o        
+          ir.o        \
+          error.o     \
+          con.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
+OBJ_X = exec-standalone.o util.o con.o
 
 #default is compiler only
 default: gmqcc
 %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)
 
+exec-standalone.o: exec.c
+       $(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
+
 # test targets
 test_ast: $(OBJ_A) $(OBJ)
-       $(CC) -o $@ $^ $(CFLAGS)        
+       $(CC) -o $@ $^ $(CFLAGS)
 test_ir:  $(OBJ_I) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
+qcvm:     $(OBJ_X)
+       $(CC) -o $@ $^ $(CFLAGS) -lm
 test: test_ast test_ir
 
-# compiler target      
+# compiler target
 gmqcc: $(OBJ_C) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 
 #all target is test and all
 all: test gmqcc
-       
+
 clean:
-       rm -f *.o gmqcc test_ast test_ir test/*.o
+       rm -f *.o gmqcc qcvm test_ast test_ir test/*.o
+       
+