X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=76439cbe02456229ab9a6cb18a700ee42ae439c6;hb=6ab09ef3bf650b69559429f2a2dd4da2706bc046;hp=ea2a27f2cf7b1b4936c9d11f8b2d721a6b947d6b;hpb=c1a85378d59f14dd572e4173cb7e28a321a7dcbe;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index ea2a27f..76439cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,52 @@
 CC     ?= clang
-CFLAGS += -Wall -I. -pedantic-errors -std=c90 -Wno-attributes
-OBJ     = 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 
-OBJ_A = test/ast-test.o
-OBJ_I = test/ir-test.o
-OBJ_C = main.o
+          ir.o        \
+          con.o       \
+          ftepp.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)
 
-# test targets
-test_ast: $(OBJ_A) $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS)	
-test_ir:  $(OBJ_I) $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS)
-test: test_ast test_ir
+exec-standalone.o: exec.c
+	$(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
+
+qcvm:     $(OBJ_X)
+	$(CC) -o $@ $^ $(CFLAGS) -lm
 
-# compiler target	
+# compiler target
 gmqcc: $(OBJ_C) $(OBJ)
 	$(CC) -o $@ $^ $(CFLAGS)
 
-#all target is test and all
-all: test gmqcc
-	
+all: gmqcc qcvm
+
 clean:
-	rm -f *.o gmqcc test_ast test_ir test/*.o
+	rm -f *.o gmqcc qcvm
+	
+