X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=Makefile;h=6b28f87ed593ca23e453ac57cee9232382fe1d68;hp=fe0f5fc3ff5b3b08b60fb091f7739b20ae50762a;hb=74cb075665a8e389cd4a5492bef158bb2f59de85;hpb=f4bc6ba08aae93b42e674295224e36eeac677420

diff --git a/Makefile b/Makefile
index fe0f5fc..6b28f87 100644
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,53 @@
 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)
-	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
-OBJ     = lex.o       \
-          error.o     \
-          parse.o     \
-          typedef.o   \
+ifeq ($(track), no)
+    CFLAGS += -DNOTRACK
+endif
+
+OBJ     = \
           util.o      \
           code.o      \
-          asm.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
@@ -51,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