From: Dale Weiler <killfieldengine@gmail.com>
Date: Sat, 17 Nov 2012 10:02:21 +0000 (+0000)
Subject: Merge branch 'master' into test-suite
X-Git-Tag: 0.1.9~409
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=d1fd7d044ba1470dd6c66b1f265ec3aafb829b07

Merge branch 'master' into test-suite

Conflicts:
	Makefile
---

d1fd7d044ba1470dd6c66b1f265ec3aafb829b07
diff --cc Makefile
index 582f0aa,5486dd1..89168d7
--- a/Makefile
+++ b/Makefile
@@@ -44,17 -46,12 +48,18 @@@ qcvm: $(OBJ_X
  gmqcc: $(OBJ_C) $(OBJ)
  	$(CC) -o $@ $^ $(CFLAGS)
  
 -all: gmqcc qcvm
 +test: $(OBJ_T)
 +	$(CC) -o $@ $^ $(CFLAGS)
 +	
 +runtests:
 +	./test
 +
 +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