Merge branch 'master' into blub/bc3

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index eaa10a0f114ec07aca89531469ef47b55873d72d..d326576da571977ee15a368ff4ab61b2f637f2b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,25 +16,24 @@ ifeq ($(CC), clang)
                -Wno-format-nonliteral
 
 endif
-OBJ     = lex.o       \
-          error.o     \
-          parse.o     \
-          typedef.o   \
+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_X = exec.o util.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)
@@ -42,7 +41,8 @@ test_ir:  $(OBJ_I) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 qcvm:     $(OBJ_X)
        $(CC) -o $@ $^ $(CFLAGS)
-exec.o: qcvm_execprogram.h
+exec.o: execloop.h
+exec-standalone.o: execloop.h
 test: test_ast test_ir
 
 # compiler target
@@ -53,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