consistency ftw

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index fe0f5fc3ff5b3b08b60fb091f7739b20ae50762a..75d4921ea0c2067ed9260b06d50ff7de7c69c417 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,18 +3,16 @@ 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 \
+       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-undef \
-               -Wno-conditional-uninitialized \
+               -Wno-padded                   \
                -Wno-format-nonliteral
 
 endif
@@ -30,17 +28,25 @@ OBJ     = lex.o       \
 OBJ_A = test/ast-test.o
 OBJ_I = test/ir-test.o
 OBJ_C = main.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
@@ -51,6 +57,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