Merge branch 'master' into ast-and-ir

[xonotic/gmqcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 6ce342c00aa64534b0fc94599618fd47815a6d4d..d9626a009eb9b3d51f3813c0fe5bf8125ca9f78e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
-CC      = gcc
-CFLAGS += -Wall
-OBJ     = main.o    \
-          lex.o     \
-          error.o   \
-          parse.o   \
-          typedef.o \
-          util.o    \
-          code.o
+CC     ?= clang
+CFLAGS += -Wall -pedantic-errors -std=c99
+OBJ     = main.o      \
+          lex.o       \
+          error.o     \
+          parse.o     \
+          typedef.o   \
+          util.o      \
+          code.o      \
+          asm.o       \
+          ast.o       \
+          ir.o
 
 %.o: %.c
        $(CC) -c $< -o $@ $(CFLAGS)