X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=28f425e7e14889342832bcfc00e94b75de3323d4;hb=c91b457054e66623915dff98dcd13f1617471f47;hp=5c26cdfda8a4b9241777b77a525ce86319b98ae9;hpb=148f7babcd5493675f129dffa913e3761a00b785;p=xonotic%2Fgmqcc.git

diff --git a/Makefile b/Makefile
index 5c26cdf..28f425e 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ CYGWIN  = $(findstring CYGWIN,  $(UNAME))
 MINGW   = $(findstring MINGW32, $(UNAME))
 
 CC     ?= clang
-CFLAGS += -Wall -Wextra -I. -pedantic-errors -std=gnu99
+CFLAGS += -Wall -Wextra -I. -pedantic-errors
 #turn on tons of warnings if clang is present
 # but also turn off the STUPID ONES
 ifeq ($(CC), clang)
@@ -19,16 +19,18 @@ ifeq ($(CC), clang)
 		-Wno-format-nonliteral        \
 		-Wno-disabled-macro-expansion \
 		-Wno-conversion               \
-		-Wno-missing-prototypes
+		-Wno-missing-prototypes       \
+		-Wno-float-equal              \
+		-Wno-cast-align
 endif
 ifeq ($(track), no)
     CFLAGS += -DNOTRACK
 endif
 
-OBJ_D = util.o code.o ast.o ir.o con.o ftepp.o opts.o
-OBJ_T = test.o util.o con.o
-OBJ_C = main.o lexer.o parser.o
-OBJ_X = exec-standalone.o util.o con.o
+OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o file.o utf8.o
+OBJ_T = test.o util.o conout.o file.o
+OBJ_C = main.o lexer.o parser.o file.o
+OBJ_X = exec-standalone.o util.o conout.o file.o
 
 ifneq ("$(CYGWIN)", "")
 	#nullify the common variables that
@@ -84,9 +86,10 @@ clean:
 	rm -f *.o $(GMQCC) $(QCVM) $(TESTSUITE) *.dat
 
 # deps
-$(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h opts.def
+$(OBJ_D) $(OBJ_C) $(OBJ_X): gmqcc.h opts.def
 main.o:   lexer.h
 parser.o: ast.h lexer.h
+lexer.o:  lexer.h
 ast.o:    ast.h ir.h
 ir.o:     ir.h