X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=6b2ef6c6486ed1828487206f91e54e769ae4dcc5;hb=9d57cf2774f7f92f489de6dbd99a43b868e2e9ec;hp=ae23ba4684aa3b726611b6bf920927d7dd3c250b;hpb=b09d75518cdf37e80db9dd77afb66b38c90cd8fc;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index ae23ba4..6b2ef6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,51 @@
 CC     ?= clang
-CFLAGS += -Wall -pedantic -std=c99
-OBJ     = main.o      \
-          lex.o       \
-          error.o     \
-          parse.o     \
-          typedef.o   \
+CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -fno-common
+#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               \
+		-Wno-disabled-macro-expansion \
+		-Wno-padded                   \
+		-Wno-format-nonliteral
+
+endif
+ifeq ($(track), no)
+    CFLAGS += -DNOTRACK
+endif
+
+OBJ     = \
           util.o      \
           code.o      \
-          asm.o       \
           ast.o       \
-          ir.o
+          ir.o        \
+          con.o
+OBJ_C = main.o lexer.o parser.o
+OBJ_X = exec-standalone.o util.o con.o
 
+#default is compiler only
+default: gmqcc
 %.o: %.c
 	$(CC) -c $< -o $@ $(CFLAGS)
 
-gmqcc: $(OBJ)
+exec-standalone.o: exec.c
+	$(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
+
+qcvm:     $(OBJ_X)
+	$(CC) -o $@ $^ $(CFLAGS) -lm
+
+# compiler target
+gmqcc: $(OBJ_C) $(OBJ)
 	$(CC) -o $@ $^ $(CFLAGS)
-	
+
+all: gmqcc qcvm
+
 clean:
-	rm -f *.o gmqcc
+	rm -f *.o gmqcc qcvm
+	
+