X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=a51aed38ac21cc404c5abba7965af8e8b25cf7ac;hb=ab86b0470c229e85ec45126ee716c0699c2a3725;hp=d326576da571977ee15a368ff4ab61b2f637f2b5;hpb=a3919a6074d3182416a03d3cb0fcd9461d3cb37e;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index d326576..a51aed3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 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)
@@ -16,11 +16,16 @@ ifeq ($(CC), clang)
 		-Wno-format-nonliteral
 
 endif
+ifeq ($(track), no)
+    CFLAGS += -DNOTRACK
+endif
+
 OBJ     = \
           util.o      \
           code.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 lexer.o parser.o
@@ -40,14 +45,14 @@ test_ast: $(OBJ_A) $(OBJ)
 test_ir:  $(OBJ_I) $(OBJ)
 	$(CC) -o $@ $^ $(CFLAGS)
 qcvm:     $(OBJ_X)
-	$(CC) -o $@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(CFLAGS) -lm
 exec.o: execloop.h
 exec-standalone.o: execloop.h
 test: test_ast test_ir
 
 # compiler target
 gmqcc: $(OBJ_C) $(OBJ)
-	$(CC) -o $@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
 
 #all target is test and all
 all: test gmqcc