the lexer now doesn't _allocate_ the token structure, also: the vector holding the...

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index feaf6111fbd4bf84549c99d2e8dc5ac7f2c48e59..6b28f87ed593ca23e453ac57cee9232382fe1d68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC     ?= clang
-CFLAGS += -Wall -I. -pedantic-errors -std=c90
+CFLAGS += -Wall -I. -pedantic-errors
 
 #turn on tons of warnings if clang is present
 ifeq ($(CC), clang)
@@ -16,26 +16,38 @@ ifeq ($(CC), clang)
                -Wno-format-nonliteral
 
 endif
+ifeq ($(track), no)
+    CFLAGS += -DNOTRACK
+endif
+
 OBJ     = \
-          error.o     \
           util.o      \
           code.o      \
           ast.o       \
-          ir.o
+          ir.o        \
+          error.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
 
 #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)
 test_ir:  $(OBJ_I) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
+qcvm:     $(OBJ_X)
+       $(CC) -o $@ $^ $(CFLAGS) -lm
+exec.o: execloop.h
+exec-standalone.o: execloop.h
 test: test_ast test_ir
 
 # compiler target
@@ -46,6 +58,6 @@ gmqcc: $(OBJ_C) $(OBJ)
 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