From: Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Date: Fri, 27 Jul 2012 17:17:03 +0000 (+0200)
Subject: Merging master with newly merged executor
X-Git-Tag: 0.1-rc1~371
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b76ffe8304dd59cf53c35f53b4b42f5a2fbac2bf;p=xonotic%2Fgmqcc.git

Merging master with newly merged executor
---

b76ffe8304dd59cf53c35f53b4b42f5a2fbac2bf
diff --cc Makefile
index 9101d2b,75d4921..d326576
--- a/Makefile
+++ b/Makefile
@@@ -16,14 -16,19 +16,15 @@@ ifeq ($(CC), clang
  		-Wno-format-nonliteral
  
  endif
 -OBJ     = lex.o       \
 -          error.o     \
 -          parse.o     \
 -          typedef.o   \
 +OBJ     = \
            util.o      \
            code.o      \
 -          asm.o       \
            ast.o       \
 -          ir.o 
 +          ir.o
  OBJ_A = test/ast-test.o
  OBJ_I = test/ir-test.o
 -OBJ_C = main.o
 +OBJ_C = main.o lexer.o parser.o
+ OBJ_X = exec-standalone.o util.o
  
  #default is compiler only
  default: gmqcc