X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=76439cbe02456229ab9a6cb18a700ee42ae439c6;hb=053d8fb0e20044eb0a3756102d3ad5372d9b52e2;hp=eaa10a0f114ec07aca89531469ef47b55873d72d;hpb=1ce97d1acc0382989526407152cb37e6b3cc4556;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index eaa10a0..76439cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 CC     ?= clang
-CFLAGS += -Wall -I. -pedantic-errors -std=c90
-
+CFLAGS += -Wall -I. -fomit-frame-pointer -fno-stack-protector -fno-common
 #turn on tons of warnings if clang is present
 ifeq ($(CC), clang)
 	CFLAGS +=                  \
@@ -16,43 +15,38 @@ ifeq ($(CC), clang)
 		-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 
-OBJ_A = test/ast-test.o
-OBJ_I = test/ir-test.o
-OBJ_C = main.o
-OBJ_X = exec.o util.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)
+exec-standalone.o: exec.c
+	$(CC) -c $< -o $@ $(CFLAGS) -DQCVM_EXECUTOR=1
+
 qcvm:     $(OBJ_X)
-	$(CC) -o $@ $^ $(CFLAGS)
-exec.o: qcvm_execprogram.h
-test: test_ast test_ir
+	$(CC) -o $@ $^ $(CFLAGS) -lm
 
 # 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