From: Dale Weiler <killfieldengine@gmail.com>
Date: Sat, 17 Nov 2012 09:56:48 +0000 (+0000)
Subject: Merge branch 'master' into test-suite
X-Git-Tag: 0.1.9~411
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=990dcb106a86ae880f55471412ff51356d56465c;p=xonotic%2Fgmqcc.git

Merge branch 'master' into test-suite

Conflicts:
	Makefile
---

990dcb106a86ae880f55471412ff51356d56465c
diff --cc Makefile
index dca3806,c17e7b4..c261b4e
--- a/Makefile
+++ b/Makefile
@@@ -44,16 -42,14 +44,20 @@@ qcvm: $(OBJ_X
  gmqcc: $(OBJ_C) $(OBJ)
  	$(CC) -o $@ $^ $(CFLAGS)
  
 -all: gmqcc qcvm
 +test: $(OBJ_T)
 +	$(CC) -o $@ $^ $(CFLAGS)
 +	
 +runtests:
 +	./test
 +
 +#all target is test and all
 +all: gmqcc qcvm test
  
  clean:
 -	rm -f *.o gmqcc qcvm
 +	rm -f *.o gmqcc qcvm test *.dat
  	
- 
+ $(OBJ) $(OBJ_C) $(OBJ_X): gmqcc.h
+ main.o: lexer.h
+ parser.o: ast.h lexer.h
+ ast.o: ast.h ir.h
+ ir.o: ir.h