From: Dale Weiler <killfieldengine@gmail.com>
Date: Sun, 2 Jun 2013 08:43:21 +0000 (+0000)
Subject: Merge branch 'cooking' into diagnostics
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1fb3e2f9160b0a91929b553b2584555afadcc564;p=xonotic%2Fgmqcc.git

Merge branch 'cooking' into diagnostics

Conflicts:
	Makefile
	main.c
	opts.def
---

1fb3e2f9160b0a91929b553b2584555afadcc564
diff --cc Makefile
index 3bcb68e,a1c08f9..f9e6858
--- a/Makefile
+++ b/Makefile
@@@ -44,11 -44,11 +44,11 @@@ ifeq ($(track), no
  	CFLAGS += -DNOTRACK
  endif
  
- OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o fs.o utf8.o correct.o diag.o
- OBJ_P = util.o fs.o conout.o opts.o pak.o
- OBJ_T = test.o util.o conout.o fs.o
- OBJ_C = main.o lexer.o parser.o fs.o
- OBJ_X = exec-standalone.o util.o conout.o fs.o
 -OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o fs.o utf8.o correct.o stat.o
++OBJ_D = util.o code.o ast.o ir.o conout.o ftepp.o opts.o fs.o utf8.o correct.o stat.o diag.o
+ OBJ_P = util.o fs.o conout.o opts.o pak.o stat.o
+ OBJ_T = test.o util.o conout.o fs.o stat.o
+ OBJ_C = main.o lexer.o parser.o fs.o stat.o
+ OBJ_X = exec-standalone.o util.o conout.o fs.o stat.o
  
  #we have duplicate object files when dealing with creating a simple list
  #for dependinces. To combat this we use some clever recrusive-make to
@@@ -244,7 -244,7 +244,8 @@@ opts.o: gmqcc.h opts.de
  fs.o: gmqcc.h opts.def
  utf8.o: gmqcc.h opts.def
  correct.o: gmqcc.h opts.def
- diag.o: gmqcc.h opts.def
+ stat.o: gmqcc.h opts.def
++diag.o: gmqcc.h opts.def lexer.h
  pak.o: gmqcc.h opts.def
  test.o: gmqcc.h opts.def
  main.o: gmqcc.h opts.def lexer.h
diff --cc main.c
index e23f3b5,5717fb5..ceaa293
--- a/main.c
+++ b/main.c
@@@ -173,7 -173,7 +173,8 @@@ static bool options_parse(int argc, cha
  
  
                      OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_GMQCC;
 +                    OPTS_OPTION_BOOL(OPTION_DIAGNOSTICS) = true;
+                     OPTS_OPTION_BOOL(OPTION_STATISTICS) = true;
  
                  } else if (!strcmp(argarg, "qcc")) {
  
@@@ -779,11 -779,7 +780,6 @@@ srcdone
              }
          }
      }
- {
-     #define FOO "\xD\xE\xA\xD\xB\xE\xE\xF\xD\xE\xA\xD\xB\xE\xE\xF"
-     char *foo = util_strdup(FOO FOO FOO FOO "hello world!");
-     (void)foo;
- }
 -
  cleanup:
      util_debug("COM", "cleaning ...\n");
      if (ftepp)
diff --cc opts.def
index 5863840,77a4094..2d994de
--- a/opts.def
+++ b/opts.def
@@@ -121,7 -121,7 +121,8 @@@
      GMQCC_DEFINE_FLAG(MAX_ARRAY_SIZE)
      GMQCC_DEFINE_FLAG(ADD_INFO)
      GMQCC_DEFINE_FLAG(CORRECTION)
 +    GMQCC_DEFINE_FLAG(DIAGNOSTICS)
+     GMQCC_DEFINE_FLAG(STATISTICS)
  #endif
  
  /* some cleanup so we don't have to */