Replaced it all...

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index d326576da571977ee15a368ff4ab61b2f637f2b5..2a9c17f588e2eb87a8a97b0b8c3b72fea6aee679 100644 (file)
--- 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,15 +15,20 @@ ifeq ($(CC), clang)
                -Wno-format-nonliteral
 
 endif
+ifeq ($(track), no)
+    CFLAGS += -DNOTRACK
+endif
+
 OBJ     = \
           util.o      \
           code.o      \
           ast.o       \
-          ir.o
+          ir.o        \
+          con.o
 OBJ_A = test/ast-test.o
 OBJ_I = test/ir-test.o
 OBJ_C = main.o lexer.o parser.o
-OBJ_X = exec-standalone.o util.o
+OBJ_X = exec-standalone.o util.o con.o
 
 #default is compiler only
 default: gmqcc
@@ -40,9 +44,7 @@ test_ast: $(OBJ_A) $(OBJ)
 test_ir:  $(OBJ_I) $(OBJ)
        $(CC) -o $@ $^ $(CFLAGS)
 qcvm:     $(OBJ_X)
-       $(CC) -o $@ $^ $(CFLAGS)
-exec.o: execloop.h
-exec-standalone.o: execloop.h
+       $(CC) -o $@ $^ $(CFLAGS) -lm
 test: test_ast test_ir
 
 # compiler target