]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Merging master with newly merged executor
authorWolfgang Bumiller <wolfgang.linux@bumiller.com>
Fri, 27 Jul 2012 17:17:03 +0000 (19:17 +0200)
committerWolfgang Bumiller <wolfgang.linux@bumiller.com>
Fri, 27 Jul 2012 17:17:03 +0000 (19:17 +0200)
1  2 
Makefile
gmqcc.h

diff --cc Makefile
index 9101d2b12a3600ae8e410e3b8ea8d31decdcd8de,75d4921ea0c2067ed9260b06d50ff7de7c69c417..d326576da571977ee15a368ff4ab61b2f637f2b5
+++ 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
diff --cc gmqcc.h
Simple merge