Merging master and adopting its main.c

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index feaf6111fbd4bf84549c99d2e8dc5ac7f2c48e59..d326576da571977ee15a368ff4ab61b2f637f2b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,25 +17,32 @@ ifeq ($(CC), clang)
 
 endif
 OBJ     = \
-          error.o     \
           util.o      \
           code.o      \
           ast.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
+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)
+exec.o: execloop.h
+exec-standalone.o: execloop.h
 test: test_ast test_ir
 
 # compiler target
@@ -46,6 +53,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