From a9ffb9140caf511cb1a0fbc52c2a62fa9d8c29d5 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 19 Mar 2008 23:53:06 +0000
Subject: [PATCH] - Fixed: lempar.c needs to specify the __cdecl calling
 convention for malloc   and free under VC++.

SVN r820 (trunk)
---
 docs/rh-log.txt         |    2 +
 src/xlat/parse_xlat.cpp |    2 +-
 src/xlat/xlat_parser.c  |  267 ++--
 tools/lemon/lempar.c    |   11 +-
 zdoom.vcproj            | 3224 +++------------------------------------
 5 files changed, 368 insertions(+), 3138 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 037f5d4f1..bc123c783 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 March 19, 2008
+- Fixed: lempar.c needs to specify the __cdecl calling convention for malloc
+  and free under VC++.
 - Fixed: The source no longer built with GCC.
 
 March 19, 2008 (Changes by Graf Zahl)
diff --git a/src/xlat/parse_xlat.cpp b/src/xlat/parse_xlat.cpp
index 5a5dc1cde..2236acc1d 100644
--- a/src/xlat/parse_xlat.cpp
+++ b/src/xlat/parse_xlat.cpp
@@ -436,7 +436,7 @@ void ParseXlat(const char *lumpname)
 	XlatToken tok;
 	tok.val=0;
 	XlatParse(pParser, 0, tok, &context);
-	XlatParseFree(pParser, free );
+	XlatParseFree(pParser, free);
 }
 
 //==========================================================================
diff --git a/src/xlat/xlat_parser.c b/src/xlat/xlat_parser.c
index fd1e14804..c42eef73b 100644
--- a/src/xlat/xlat_parser.c
+++ b/src/xlat/xlat_parser.c
@@ -6,6 +6,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+
+#ifdef _MSC_VER
+#define CDECL __cdecl
+#else
+#define CDECL
+#endif
+
 /* Next is all token values, in a form suitable for use by makeheaders.
 ** This section will be null unless lemon is run with the -m switch.
 */
@@ -461,7 +468,7 @@ static void yyGrowStack(yyParser *p){
 ** A pointer to a parser.  This pointer is used in subsequent calls
 ** to XlatParse and XlatParseFree.
 */
-void *XlatParseAlloc(void *(*mallocProc)(size_t)){
+void *XlatParseAlloc(void *(CDECL *mallocProc)(size_t)){
   yyParser *pParser;
   pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) );
   if( pParser ){
@@ -520,9 +527,9 @@ static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){
     case 28: /* ARG5 */
     case 29: /* OR_EQUAL */
     case 30: /* COLON */
-#line 3 "src/xlat/xlat_parser.y"
+#line 3 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {}
-#line 526 "src/xlat/xlat_parser.c"
+#line 533 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
       break;
     default:  break;   /* If no destructor action specified: do nothing */
   }
@@ -568,7 +575,7 @@ static int yy_pop_parser_stack(yyParser *pParser){
 */
 void XlatParseFree(
   void *p,                    /* The parser to be deleted */
-  void (*freeProc)(void*)     /* Function used to reclaim memory */
+  void (CDECL *freeProc)(void*)     /* Function used to reclaim memory */
 ){
   yyParser *pParser = (yyParser*)p;
   if( pParser==0 ) return;
@@ -860,133 +867,133 @@ static void yy_reduce(
       case 6: /*external_declaration ::= boom_declaration */
       case 22: /*enum_list ::= */
       case 23: /*enum_list ::= single_enum */
-#line 9 "src/xlat/xlat_parser.y"
+#line 9 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 }
-#line 867 "src/xlat/xlat_parser.c"
+#line 874 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 7: /* external_declaration ::= NOP */
-#line 18 "src/xlat/xlat_parser.y"
+#line 18 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
   yy_destructor(1,&yymsp[0].minor);
 }
-#line 874 "src/xlat/xlat_parser.c"
+#line 881 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 8: /* exp ::= NUM */
-#line 29 "src/xlat/xlat_parser.y"
+#line 29 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[0].minor.yy0.val; }
-#line 879 "src/xlat/xlat_parser.c"
+#line 886 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 9: /* exp ::= SYMNUM */
-#line 30 "src/xlat/xlat_parser.y"
+#line 30 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[0].minor.yy0.symval->Value; }
-#line 884 "src/xlat/xlat_parser.c"
+#line 891 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 10: /* exp ::= exp PLUS exp */
-#line 31 "src/xlat/xlat_parser.y"
+#line 31 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[-2].minor.yy94 + yymsp[0].minor.yy94;   yy_destructor(6,&yymsp[-1].minor);
 }
-#line 890 "src/xlat/xlat_parser.c"
+#line 897 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 11: /* exp ::= exp MINUS exp */
-#line 32 "src/xlat/xlat_parser.y"
+#line 32 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[-2].minor.yy94 - yymsp[0].minor.yy94;   yy_destructor(5,&yymsp[-1].minor);
 }
-#line 896 "src/xlat/xlat_parser.c"
+#line 903 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 12: /* exp ::= exp MULTIPLY exp */
-#line 33 "src/xlat/xlat_parser.y"
+#line 33 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[-2].minor.yy94 * yymsp[0].minor.yy94;   yy_destructor(7,&yymsp[-1].minor);
 }
-#line 902 "src/xlat/xlat_parser.c"
+#line 909 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 13: /* exp ::= exp DIVIDE exp */
-#line 34 "src/xlat/xlat_parser.y"
+#line 34 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[-2].minor.yy94 / yymsp[0].minor.yy94;   yy_destructor(8,&yymsp[-1].minor);
 }
-#line 908 "src/xlat/xlat_parser.c"
+#line 915 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 14: /* exp ::= exp OR exp */
-#line 35 "src/xlat/xlat_parser.y"
+#line 35 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[-2].minor.yy94 | yymsp[0].minor.yy94;   yy_destructor(2,&yymsp[-1].minor);
 }
-#line 914 "src/xlat/xlat_parser.c"
+#line 921 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 15: /* exp ::= exp AND exp */
-#line 36 "src/xlat/xlat_parser.y"
+#line 36 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[-2].minor.yy94 & yymsp[0].minor.yy94;   yy_destructor(4,&yymsp[-1].minor);
 }
-#line 920 "src/xlat/xlat_parser.c"
+#line 927 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 16: /* exp ::= exp XOR exp */
-#line 37 "src/xlat/xlat_parser.y"
+#line 37 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[-2].minor.yy94 ^ yymsp[0].minor.yy94;   yy_destructor(3,&yymsp[-1].minor);
 }
-#line 926 "src/xlat/xlat_parser.c"
+#line 933 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 17: /* exp ::= MINUS exp */
-#line 38 "src/xlat/xlat_parser.y"
+#line 38 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = -yymsp[0].minor.yy94;   yy_destructor(5,&yymsp[-1].minor);
 }
-#line 932 "src/xlat/xlat_parser.c"
+#line 939 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 18: /* exp ::= LPAREN exp RPAREN */
-#line 39 "src/xlat/xlat_parser.y"
+#line 39 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = yymsp[-1].minor.yy94;   yy_destructor(12,&yymsp[-2].minor);
   yy_destructor(13,&yymsp[0].minor);
 }
-#line 939 "src/xlat/xlat_parser.c"
+#line 946 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 19: /* define_statement ::= DEFINE SYM LPAREN exp RPAREN */
-#line 49 "src/xlat/xlat_parser.y"
+#line 49 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	context->AddSym (yymsp[-3].minor.yy0.sym, yymsp[-1].minor.yy94);
   yy_destructor(14,&yymsp[-4].minor);
   yy_destructor(12,&yymsp[-2].minor);
   yy_destructor(13,&yymsp[0].minor);
 }
-#line 949 "src/xlat/xlat_parser.c"
+#line 956 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 20: /* enum_statement ::= enum_open enum_list RBRACE */
-#line 59 "src/xlat/xlat_parser.y"
+#line 59 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
   yy_destructor(16,&yymsp[0].minor);
 }
-#line 956 "src/xlat/xlat_parser.c"
+#line 963 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 21: /* enum_open ::= ENUM LBRACE */
-#line 62 "src/xlat/xlat_parser.y"
+#line 62 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	context->EnumVal = 0;
   yy_destructor(17,&yymsp[-1].minor);
   yy_destructor(18,&yymsp[0].minor);
 }
-#line 965 "src/xlat/xlat_parser.c"
+#line 972 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 24: /* enum_list ::= single_enum COMMA enum_list */
-#line 68 "src/xlat/xlat_parser.y"
+#line 68 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 972 "src/xlat/xlat_parser.c"
+#line 979 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 25: /* single_enum ::= SYM */
-#line 71 "src/xlat/xlat_parser.y"
+#line 71 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	context->AddSym (yymsp[0].minor.yy0.sym, context->EnumVal++);
 }
-#line 979 "src/xlat/xlat_parser.c"
+#line 986 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 26: /* single_enum ::= SYM EQUALS exp */
-#line 76 "src/xlat/xlat_parser.y"
+#line 76 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	context->AddSym (yymsp[-2].minor.yy0.sym, context->EnumVal = yymsp[0].minor.yy94);
   yy_destructor(20,&yymsp[-1].minor);
 }
-#line 987 "src/xlat/xlat_parser.c"
+#line 994 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 27: /* linetype_declaration ::= exp EQUALS exp COMMA exp LPAREN special_args RPAREN */
-#line 87 "src/xlat/xlat_parser.y"
+#line 87 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	SimpleLineTranslations.SetVal(yymsp[-7].minor.yy94, 
 		FLineTrans(yymsp[-3].minor.yy94&0xffff, yymsp[-5].minor.yy94+yymsp[-1].minor.yy15.addflags, yymsp[-1].minor.yy15.args[0], yymsp[-1].minor.yy15.args[1], yymsp[-1].minor.yy15.args[2], yymsp[-1].minor.yy15.args[3], yymsp[-1].minor.yy15.args[4]));
@@ -995,10 +1002,10 @@ static void yy_reduce(
   yy_destructor(12,&yymsp[-2].minor);
   yy_destructor(13,&yymsp[0].minor);
 }
-#line 999 "src/xlat/xlat_parser.c"
+#line 1006 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 28: /* linetype_declaration ::= exp EQUALS exp COMMA SYM LPAREN special_args RPAREN */
-#line 93 "src/xlat/xlat_parser.y"
+#line 93 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	Printf ("%s, line %d: %s is undefined\n", context->SourceFile, context->SourceLine, yymsp[-3].minor.yy0.sym);
   yy_destructor(20,&yymsp[-6].minor);
@@ -1006,10 +1013,10 @@ static void yy_reduce(
   yy_destructor(12,&yymsp[-2].minor);
   yy_destructor(13,&yymsp[0].minor);
 }
-#line 1010 "src/xlat/xlat_parser.c"
+#line 1017 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 29: /* special_args ::= */
-#line 100 "src/xlat/xlat_parser.y"
+#line 100 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = 0;
 	yygotominor.yy15.args[0] = 0;
@@ -1018,10 +1025,10 @@ static void yy_reduce(
 	yygotominor.yy15.args[3] = 0;
 	yygotominor.yy15.args[4] = 0;
 }
-#line 1022 "src/xlat/xlat_parser.c"
+#line 1029 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 30: /* special_args ::= TAG */
-#line 109 "src/xlat/xlat_parser.y"
+#line 109 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT1;
 	yygotominor.yy15.args[0] = 0;
@@ -1031,10 +1038,10 @@ static void yy_reduce(
 	yygotominor.yy15.args[4] = 0;
   yy_destructor(21,&yymsp[0].minor);
 }
-#line 1035 "src/xlat/xlat_parser.c"
+#line 1042 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 31: /* special_args ::= TAG COMMA exp */
-#line 118 "src/xlat/xlat_parser.y"
+#line 118 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT1;
 	yygotominor.yy15.args[0] = 0;
@@ -1045,10 +1052,10 @@ static void yy_reduce(
   yy_destructor(21,&yymsp[-2].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1049 "src/xlat/xlat_parser.c"
+#line 1056 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 32: /* special_args ::= TAG COMMA exp COMMA exp */
-#line 127 "src/xlat/xlat_parser.y"
+#line 127 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT1;
 	yygotominor.yy15.args[0] = 0;
@@ -1060,10 +1067,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1064 "src/xlat/xlat_parser.c"
+#line 1071 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 33: /* special_args ::= TAG COMMA exp COMMA exp COMMA exp */
-#line 136 "src/xlat/xlat_parser.y"
+#line 136 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT1;
 	yygotominor.yy15.args[0] = 0;
@@ -1076,10 +1083,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1080 "src/xlat/xlat_parser.c"
+#line 1087 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 34: /* special_args ::= TAG COMMA exp COMMA exp COMMA exp COMMA exp */
-#line 145 "src/xlat/xlat_parser.y"
+#line 145 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT1;
 	yygotominor.yy15.args[0] = 0;
@@ -1093,10 +1100,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1097 "src/xlat/xlat_parser.c"
+#line 1104 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 35: /* special_args ::= TAG COMMA TAG */
-#line 154 "src/xlat/xlat_parser.y"
+#line 154 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HAS2TAGS;
 	yygotominor.yy15.args[0] = yygotominor.yy15.args[1] = 0;
@@ -1107,10 +1114,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-1].minor);
   yy_destructor(21,&yymsp[0].minor);
 }
-#line 1111 "src/xlat/xlat_parser.c"
+#line 1118 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 36: /* special_args ::= TAG COMMA TAG COMMA exp */
-#line 162 "src/xlat/xlat_parser.y"
+#line 162 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HAS2TAGS;
 	yygotominor.yy15.args[0] = yygotominor.yy15.args[1] = 0;
@@ -1122,10 +1129,10 @@ static void yy_reduce(
   yy_destructor(21,&yymsp[-2].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1126 "src/xlat/xlat_parser.c"
+#line 1133 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 37: /* special_args ::= TAG COMMA TAG COMMA exp COMMA exp */
-#line 170 "src/xlat/xlat_parser.y"
+#line 170 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HAS2TAGS;
 	yygotominor.yy15.args[0] = yygotominor.yy15.args[1] = 0;
@@ -1138,10 +1145,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1142 "src/xlat/xlat_parser.c"
+#line 1149 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 38: /* special_args ::= TAG COMMA TAG COMMA exp COMMA exp COMMA exp */
-#line 178 "src/xlat/xlat_parser.y"
+#line 178 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HAS2TAGS;
 	yygotominor.yy15.args[0] = yygotominor.yy15.args[1] = 0;
@@ -1155,10 +1162,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1159 "src/xlat/xlat_parser.c"
+#line 1166 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 39: /* special_args ::= exp */
-#line 186 "src/xlat/xlat_parser.y"
+#line 186 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = 0;
 	yygotominor.yy15.args[0] = yymsp[0].minor.yy94;
@@ -1167,10 +1174,10 @@ static void yy_reduce(
 	yygotominor.yy15.args[3] = 0;
 	yygotominor.yy15.args[4] = 0;
 }
-#line 1171 "src/xlat/xlat_parser.c"
+#line 1178 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 40: /* special_args ::= exp COMMA exp */
-#line 195 "src/xlat/xlat_parser.y"
+#line 195 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = 0;
 	yygotominor.yy15.args[0] = yymsp[-2].minor.yy94;
@@ -1180,10 +1187,10 @@ static void yy_reduce(
 	yygotominor.yy15.args[4] = 0;
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1184 "src/xlat/xlat_parser.c"
+#line 1191 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 41: /* special_args ::= exp COMMA exp COMMA exp */
-#line 204 "src/xlat/xlat_parser.y"
+#line 204 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = 0;
 	yygotominor.yy15.args[0] = yymsp[-4].minor.yy94;
@@ -1194,10 +1201,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1198 "src/xlat/xlat_parser.c"
+#line 1205 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 42: /* special_args ::= exp COMMA exp COMMA exp COMMA exp */
-#line 213 "src/xlat/xlat_parser.y"
+#line 213 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = 0;
 	yygotominor.yy15.args[0] = yymsp[-6].minor.yy94;
@@ -1209,10 +1216,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1213 "src/xlat/xlat_parser.c"
+#line 1220 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 43: /* special_args ::= exp COMMA exp COMMA exp COMMA exp COMMA exp */
-#line 222 "src/xlat/xlat_parser.y"
+#line 222 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = 0;
 	yygotominor.yy15.args[0] = yymsp[-8].minor.yy94;
@@ -1225,10 +1232,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1229 "src/xlat/xlat_parser.c"
+#line 1236 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 44: /* special_args ::= exp COMMA TAG */
-#line 231 "src/xlat/xlat_parser.y"
+#line 231 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT2;
 	yygotominor.yy15.args[0] = yymsp[-2].minor.yy94;
@@ -1239,10 +1246,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-1].minor);
   yy_destructor(21,&yymsp[0].minor);
 }
-#line 1243 "src/xlat/xlat_parser.c"
+#line 1250 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 45: /* special_args ::= exp COMMA TAG COMMA exp */
-#line 240 "src/xlat/xlat_parser.y"
+#line 240 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT2;
 	yygotominor.yy15.args[0] = yymsp[-4].minor.yy94;
@@ -1254,10 +1261,10 @@ static void yy_reduce(
   yy_destructor(21,&yymsp[-2].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1258 "src/xlat/xlat_parser.c"
+#line 1265 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 46: /* special_args ::= exp COMMA TAG COMMA exp COMMA exp */
-#line 249 "src/xlat/xlat_parser.y"
+#line 249 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT2;
 	yygotominor.yy15.args[0] = yymsp[-6].minor.yy94;
@@ -1270,10 +1277,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1274 "src/xlat/xlat_parser.c"
+#line 1281 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 47: /* special_args ::= exp COMMA TAG COMMA exp COMMA exp COMMA exp */
-#line 258 "src/xlat/xlat_parser.y"
+#line 258 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT2;
 	yygotominor.yy15.args[0] = yymsp[-8].minor.yy94;
@@ -1287,10 +1294,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1291 "src/xlat/xlat_parser.c"
+#line 1298 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 48: /* special_args ::= exp COMMA exp COMMA TAG */
-#line 267 "src/xlat/xlat_parser.y"
+#line 267 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT3;
 	yygotominor.yy15.args[0] = yymsp[-4].minor.yy94;
@@ -1302,10 +1309,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-1].minor);
   yy_destructor(21,&yymsp[0].minor);
 }
-#line 1306 "src/xlat/xlat_parser.c"
+#line 1313 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 49: /* special_args ::= exp COMMA exp COMMA TAG COMMA exp */
-#line 276 "src/xlat/xlat_parser.y"
+#line 276 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT3;
 	yygotominor.yy15.args[0] = yymsp[-6].minor.yy94;
@@ -1318,10 +1325,10 @@ static void yy_reduce(
   yy_destructor(21,&yymsp[-2].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1322 "src/xlat/xlat_parser.c"
+#line 1329 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 50: /* special_args ::= exp COMMA exp COMMA TAG COMMA exp COMMA exp */
-#line 285 "src/xlat/xlat_parser.y"
+#line 285 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT3;
 	yygotominor.yy15.args[0] = yymsp[-8].minor.yy94;
@@ -1335,10 +1342,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-3].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1339 "src/xlat/xlat_parser.c"
+#line 1346 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 51: /* special_args ::= exp COMMA exp COMMA exp COMMA TAG */
-#line 294 "src/xlat/xlat_parser.y"
+#line 294 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT4;
 	yygotominor.yy15.args[0] = yymsp[-6].minor.yy94;
@@ -1351,10 +1358,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-1].minor);
   yy_destructor(21,&yymsp[0].minor);
 }
-#line 1355 "src/xlat/xlat_parser.c"
+#line 1362 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 52: /* special_args ::= exp COMMA exp COMMA exp COMMA TAG COMMA exp */
-#line 303 "src/xlat/xlat_parser.y"
+#line 303 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT4;
 	yygotominor.yy15.args[0] = yymsp[-8].minor.yy94;
@@ -1368,10 +1375,10 @@ static void yy_reduce(
   yy_destructor(21,&yymsp[-2].minor);
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1372 "src/xlat/xlat_parser.c"
+#line 1379 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 53: /* special_args ::= exp COMMA exp COMMA exp COMMA exp COMMA TAG */
-#line 312 "src/xlat/xlat_parser.y"
+#line 312 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy15.addflags = LINETRANS_HASTAGAT5;
 	yygotominor.yy15.args[0] = yymsp[-8].minor.yy94;
@@ -1385,10 +1392,10 @@ static void yy_reduce(
   yy_destructor(19,&yymsp[-1].minor);
   yy_destructor(21,&yymsp[0].minor);
 }
-#line 1389 "src/xlat/xlat_parser.c"
+#line 1396 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 54: /* boom_declaration ::= LBRACKET exp RBRACKET LPAREN exp COMMA exp RPAREN LBRACE boom_body RBRACE */
-#line 337 "src/xlat/xlat_parser.y"
+#line 337 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	int i;
 	MoreLines *probe;
@@ -1428,26 +1435,26 @@ static void yy_reduce(
   yy_destructor(18,&yymsp[-2].minor);
   yy_destructor(16,&yymsp[0].minor);
 }
-#line 1432 "src/xlat/xlat_parser.c"
+#line 1439 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 55: /* boom_body ::= */
-#line 371 "src/xlat/xlat_parser.y"
+#line 371 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy81 = NULL;
 }
-#line 1439 "src/xlat/xlat_parser.c"
+#line 1446 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 56: /* boom_body ::= boom_line boom_body */
-#line 375 "src/xlat/xlat_parser.y"
+#line 375 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy81 = new MoreLines;
 	yygotominor.yy81->next = yymsp[0].minor.yy81;
 	yygotominor.yy81->arg = yymsp[-1].minor.yy20;
 }
-#line 1448 "src/xlat/xlat_parser.c"
+#line 1455 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 57: /* boom_line ::= boom_selector boom_op boom_args */
-#line 382 "src/xlat/xlat_parser.y"
+#line 382 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy20.bOrExisting = (yymsp[-1].minor.yy94 == OR_EQUAL);
 	yygotominor.yy20.bUseConstant = (yymsp[0].minor.yy40.filters == NULL);
@@ -1478,95 +1485,95 @@ static void yy_reduce(
 		yygotominor.yy20.ListSize = i > 15 ? 15 : i;
 	}
 }
-#line 1482 "src/xlat/xlat_parser.c"
+#line 1489 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 58: /* boom_selector ::= FLAGS */
-#line 413 "src/xlat/xlat_parser.y"
+#line 413 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = 4;   yy_destructor(24,&yymsp[0].minor);
 }
-#line 1488 "src/xlat/xlat_parser.c"
+#line 1495 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 59: /* boom_selector ::= ARG2 */
-#line 414 "src/xlat/xlat_parser.y"
+#line 414 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = 0;   yy_destructor(25,&yymsp[0].minor);
 }
-#line 1494 "src/xlat/xlat_parser.c"
+#line 1501 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 60: /* boom_selector ::= ARG3 */
-#line 415 "src/xlat/xlat_parser.y"
+#line 415 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = 1;   yy_destructor(26,&yymsp[0].minor);
 }
-#line 1500 "src/xlat/xlat_parser.c"
+#line 1507 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 61: /* boom_selector ::= ARG4 */
-#line 416 "src/xlat/xlat_parser.y"
+#line 416 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = 2;   yy_destructor(27,&yymsp[0].minor);
 }
-#line 1506 "src/xlat/xlat_parser.c"
+#line 1513 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 62: /* boom_selector ::= ARG5 */
-#line 417 "src/xlat/xlat_parser.y"
+#line 417 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = 3;   yy_destructor(28,&yymsp[0].minor);
 }
-#line 1512 "src/xlat/xlat_parser.c"
+#line 1519 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 63: /* boom_op ::= EQUALS */
-#line 419 "src/xlat/xlat_parser.y"
+#line 419 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = '=';   yy_destructor(20,&yymsp[0].minor);
 }
-#line 1518 "src/xlat/xlat_parser.c"
+#line 1525 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 64: /* boom_op ::= OR_EQUAL */
-#line 420 "src/xlat/xlat_parser.y"
+#line 420 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 { yygotominor.yy94 = OR_EQUAL;   yy_destructor(29,&yymsp[0].minor);
 }
-#line 1524 "src/xlat/xlat_parser.c"
+#line 1531 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 65: /* boom_args ::= exp */
-#line 423 "src/xlat/xlat_parser.y"
+#line 423 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy40.constant = yymsp[0].minor.yy94;
 	yygotominor.yy40.filters = NULL;
 }
-#line 1532 "src/xlat/xlat_parser.c"
+#line 1539 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 66: /* boom_args ::= exp LBRACKET arg_list RBRACKET */
-#line 428 "src/xlat/xlat_parser.y"
+#line 428 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy40.mask = yymsp[-3].minor.yy94;
 	yygotominor.yy40.filters = yymsp[-1].minor.yy39;
   yy_destructor(22,&yymsp[-2].minor);
   yy_destructor(23,&yymsp[0].minor);
 }
-#line 1542 "src/xlat/xlat_parser.c"
+#line 1549 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 67: /* arg_list ::= list_val */
-#line 434 "src/xlat/xlat_parser.y"
+#line 434 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy39 = new MoreFilters;
 	yygotominor.yy39->next = NULL;
 	yygotominor.yy39->filter = yymsp[0].minor.yy11;
 }
-#line 1551 "src/xlat/xlat_parser.c"
+#line 1558 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 68: /* arg_list ::= list_val COMMA arg_list */
-#line 440 "src/xlat/xlat_parser.y"
+#line 440 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy39 = new MoreFilters;
 	yygotominor.yy39->next = yymsp[0].minor.yy39;
 	yygotominor.yy39->filter = yymsp[-2].minor.yy11;
   yy_destructor(19,&yymsp[-1].minor);
 }
-#line 1561 "src/xlat/xlat_parser.c"
+#line 1568 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
       case 69: /* list_val ::= exp COLON exp */
-#line 447 "src/xlat/xlat_parser.y"
+#line 447 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
 {
 	yygotominor.yy11.filter = yymsp[-2].minor.yy94;
 	yygotominor.yy11.value = yymsp[0].minor.yy94;
   yy_destructor(30,&yymsp[-1].minor);
 }
-#line 1570 "src/xlat/xlat_parser.c"
+#line 1577 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
         break;
   };
   yygoto = yyRuleInfo[yyruleno].lhs;
@@ -1624,9 +1631,9 @@ static void yy_syntax_error(
 ){
   XlatParseARG_FETCH;
 #define TOKEN (yyminor.yy0)
-#line 6 "src/xlat/xlat_parser.y"
+#line 6 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.y"
  context->PrintError("syntax error");
-#line 1630 "src/xlat/xlat_parser.c"
+#line 1637 "c:\\zdoom\\trunk\\src\\xlat\\xlat_parser.c"
   XlatParseARG_STORE; /* Suppress warning about unused %extra_argument variable */
 }
 
diff --git a/tools/lemon/lempar.c b/tools/lemon/lempar.c
index d32a79490..c6c032ca9 100644
--- a/tools/lemon/lempar.c
+++ b/tools/lemon/lempar.c
@@ -6,6 +6,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+
+#ifdef _MSC_VER
+#define CDECL __cdecl
+#else
+#define CDECL
+#endif
+
 %%
 /* Next is all token values, in a form suitable for use by makeheaders.
 ** This section will be null unless lemon is run with the -m switch.
@@ -247,7 +254,7 @@ static void yyGrowStack(yyParser *p){
 ** A pointer to a parser.  This pointer is used in subsequent calls
 ** to Parse and ParseFree.
 */
-void *ParseAlloc(void *(*mallocProc)(size_t)){
+void *ParseAlloc(void *(CDECL *mallocProc)(size_t)){
   yyParser *pParser;
   pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) );
   if( pParser ){
@@ -321,7 +328,7 @@ static int yy_pop_parser_stack(yyParser *pParser){
 */
 void ParseFree(
   void *p,                    /* The parser to be deleted */
-  void (*freeProc)(void*)     /* Function used to reclaim memory */
+  void (CDECL *freeProc)(void*)     /* Function used to reclaim memory */
 ){
   yyParser *pParser = (yyParser*)p;
   if( pParser==0 ) return;
diff --git a/zdoom.vcproj b/zdoom.vcproj
index c5ecbb523..1f2ed1c90 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="zdoom"
 	ProjectGUID="{8049475B-5C87-46F9-9358-635218A4EF18}"
 	RootNamespace=" zdoom"
@@ -135,112 +135,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Checking svnrevision.h..."
-				CommandLine="$(OutDir)\updaterevision.exe src src/svnrevision.h"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/zdoom.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;jpeg-6b;snes_spc\snes_spc"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WIN32,_WINDOWS,USEASM,_CRTDBG_MAP_ALLOC,HAVE_STRUPR,HAVE_FILELENGTH"
-				MinimalRebuild="true"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				ForceConformanceInForLoopScope="true"
-				PrecompiledHeaderFile=""
-				AssemblerOutput="4"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-				DisableSpecificWarnings="4996"
-				ForcedIncludeFiles=""
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib fmodex_vc.lib setupapi.lib ws2_32.lib"
-				OutputFile="../zdoomd.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="libcmt;msvcrtd;msvcrt"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/zdoomd.pdb"
-				SubSystem="2"
-				StackReserveSize="0"
-				TerminalServerAware="2"
-				SetChecksum="false"
-				TargetMachine="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@@ -355,6 +249,112 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Checking svnrevision.h..."
+				CommandLine="$(OutDir)\updaterevision.exe src src/svnrevision.h"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/zdoom.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;jpeg-6b;snes_spc\snes_spc"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WIN32,_WINDOWS,USEASM,_CRTDBG_MAP_ALLOC,HAVE_STRUPR,HAVE_FILELENGTH"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
+				EnableFunctionLevelLinking="true"
+				ForceConformanceInForLoopScope="true"
+				PrecompiledHeaderFile=""
+				AssemblerOutput="4"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+				ForcedIncludeFiles=""
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="gdi32.lib user32.lib comctl32.lib shell32.lib advapi32.lib comdlg32.lib ole32.lib dxguid.lib dsound.lib dinput8.lib strmiids.lib wsock32.lib winmm.lib fmodex_vc.lib setupapi.lib ws2_32.lib"
+				OutputFile="../zdoomd.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames="libcmt;msvcrtd;msvcrt"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/zdoomd.pdb"
+				SubSystem="2"
+				StackReserveSize="0"
+				TerminalServerAware="2"
+				SetChecksum="false"
+				TargetMachine="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@@ -470,470 +470,106 @@
 			<File
 				RelativePath=".\src\am_map.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\autostart.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\autozend.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\b_bot.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\B_func.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\B_game.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\b_move.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\B_think.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\bbannouncer.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\c_bind.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\c_cmds.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\c_console.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\c_cvars.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\c_dispatch.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\c_expr.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\cmdlib.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\colormatcher.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\configfile.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\ct_chat.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\d_dehacked.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\D_main.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\d_net.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\d_netinfo.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\d_protocol.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\decallib.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\dobject.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\dobjgc.cpp"
@@ -946,128 +582,30 @@
 			<File
 				RelativePath=".\src\doomdef.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\doomstat.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\dsectoreffect.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\dthinker.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\f_finale.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\f_wipe.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\farchive.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\files.cpp"
@@ -1076,20 +614,6 @@
 			<File
 				RelativePath=".\src\g_game.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hub.cpp"
@@ -1098,74 +622,18 @@
 			<File
 				RelativePath=".\src\g_level.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\gameconfigfile.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\gi.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\hu_scores.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\i_net.cpp"
@@ -1174,236 +642,54 @@
 			<File
 				RelativePath=".\src\info.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\infodefaults.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\lumpconfigfile.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_alloc.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_argv.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_bbox.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_cheat.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_menu.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_misc.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_options.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_png.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\m_random.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\mus2midi.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\name.cpp"
@@ -1460,56 +746,14 @@
 			<File
 				RelativePath=".\src\p_acs.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_buildmap.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_ceiling.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_conversation.cpp"
@@ -1518,56 +762,14 @@
 			<File
 				RelativePath=".\src\p_doors.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_effect.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_enemy.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_enemy_a_lookex.cpp"
@@ -1576,56 +778,14 @@
 			<File
 				RelativePath=".\src\p_floor.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_interaction.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_lights.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_lnspec.cpp"
@@ -1638,13 +798,6 @@
 						GeneratePreprocessedFile="0"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -1657,38 +810,10 @@
 			<File
 				RelativePath=".\src\p_map.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_maputl.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_mobj.cpp"
@@ -1702,7 +827,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1710,7 +835,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1729,344 +854,78 @@
 			<File
 				RelativePath=".\src\p_pillar.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_plats.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_pspr.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_saveg.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_sectors.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_setup.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_sight.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_spec.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_switch.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_teleport.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_terrain.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_things.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_tick.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_trace.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_user.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_writemap.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\p_xlat.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\po_man.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\s_advsound.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\s_environment.cpp"
@@ -2075,74 +934,18 @@
 			<File
 				RelativePath=".\src\s_playlist.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\s_sndseq.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\s_sound.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\sc_man.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\sc_man_scanner.h"
@@ -2161,16 +964,6 @@
 						Outputs="&quot;src/$(InputName).h&quot;"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating $(InputName).h from src/$(InputFileName)"
-						CommandLine="tools\re2c\re2c --no-generation-date -s -o &quot;src/$(InputName).h&quot; &quot;src/$(InputFileName)&quot;&#x0D;&#x0A;"
-						Outputs="&quot;src/$(InputName).h&quot;"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -2181,6 +974,16 @@
 						Outputs="&quot;src/$(InputName).h&quot;"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Creating $(InputName).h from src/$(InputFileName)"
+						CommandLine="tools\re2c\re2c --no-generation-date -s -o &quot;src/$(InputName).h&quot; &quot;src/$(InputFileName)&quot;&#x0D;&#x0A;"
+						Outputs="&quot;src/$(InputName).h&quot;"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -2195,92 +998,22 @@
 			<File
 				RelativePath=".\src\skins.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\st_stuff.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\stats.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\stringtable.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\tables.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\teaminfo.cpp"
@@ -2289,182 +1022,42 @@
 			<File
 				RelativePath=".\src\tempfiles.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\v_collection.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\v_draw.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\v_font.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\v_palette.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\v_pfx.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\v_text.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\v_video.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\w_wad.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\wi_stuff.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\zstrformat.cpp"
@@ -2981,16 +1574,6 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Assembling $(InputPath)..."
-						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -3001,6 +1584,16 @@
 						Outputs="$(IntDir)/$(InputName).obj"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling $(InputPath)..."
+						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -3025,16 +1618,6 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Assembling $(InputPath)..."
-						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -3045,6 +1628,16 @@
 						Outputs="$(IntDir)/$(InputName).obj"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling $(InputPath)..."
+						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -3069,16 +1662,6 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Assembling $(InputPath)..."
-						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -3089,6 +1672,16 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling $(InputPath)..."
+						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -3113,16 +1706,6 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Assembling $(InputPath)..."
-						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -3133,6 +1716,16 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling $(InputPath)..."
+						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -3157,16 +1750,6 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Assembling $(InputPath)..."
-						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
-						Outputs="$(IntDir)\$(InputName).obj"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -3177,6 +1760,16 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling $(InputPath)..."
+						CommandLine="nasm -g -o &quot;$(IntDir)\$(InputName).obj&quot; -f win32 &quot;$(InputPath)&quot;&#x0D;&#x0A;$(OutDir)\fixrtext &quot;$(IntDir)\$(InputName).obj&quot;&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -3255,20 +1848,6 @@
 			<File
 				RelativePath=".\src\win32\hardware.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\win32\hardware.h"
@@ -3277,20 +1856,6 @@
 			<File
 				RelativePath=".\src\win32\helperthread.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\win32\helperthread.h"
@@ -3299,20 +1864,6 @@
 			<File
 				RelativePath=".\src\win32\i_cd.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\win32\i_crash.cpp"
@@ -3321,20 +1872,6 @@
 			<File
 				RelativePath=".\src\win32\i_input.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\win32\i_input.h"
@@ -3343,56 +1880,14 @@
 			<File
 				RelativePath=".\src\win32\i_main.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\win32\i_movie.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\win32\I_system.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\win32\I_system.h"
@@ -3421,20 +1916,6 @@
 			<File
 				RelativePath=".\src\win32\win32video.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\win32\wrappers.nas"
@@ -3449,6 +1930,14 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@@ -3459,14 +1948,6 @@
 						Outputs="$(IntDir)\$(InputName).obj"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					ExcludedFromBuild="true"
@@ -3483,20 +1964,6 @@
 			<File
 				RelativePath=".\src\g_shared\a_action.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_action.h"
@@ -3509,20 +1976,6 @@
 			<File
 				RelativePath=".\src\g_shared\a_artifacts.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_artifacts.h"
@@ -3531,56 +1984,14 @@
 			<File
 				RelativePath=".\src\g_shared\a_bridge.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_camera.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_debris.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_decals.cpp"
@@ -3601,49 +2012,14 @@
 						GeneratePreprocessedFile="0"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_flashfader.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_fountain.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\g_shared\a_hatetarget.cpp"
@@ -3660,20 +2036,6 @@
 			<File
 				RelativePath=".\src\g_shared\a_lightning.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_lightning.h"
@@ -3690,38 +2052,10 @@
 			<File
 				RelativePath=".\src\g_shared\a_movingcamera.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_pickups.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_pickups.h"
@@ -3734,56 +2068,14 @@
 			<File
 				RelativePath=".\src\g_shared\a_quake.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_secrettrigger.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_sectoraction.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_setcolor.cpp"
@@ -3796,20 +2088,6 @@
 			<File
 				RelativePath=".\src\g_shared\a_skies.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\g_shared\a_soundenvironment.cpp"
@@ -3822,38 +2100,10 @@
 			<File
 				RelativePath=".\src\g_shared\a_spark.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_waterzone.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\a_weaponpiece.cpp"
@@ -3866,38 +2116,10 @@
 			<File
 				RelativePath=".\src\g_shared\a_weapons.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\hudmessages.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_shared\sbar.h"
@@ -3922,20 +2144,6 @@
 			<File
 				RelativePath=".\src\g_shared\shared_sbar.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -3944,128 +2152,30 @@
 			<File
 				RelativePath=".\src\g_doom\a_arachnotron.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_archvile.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_bossbrain.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_bruiser.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_cacodemon.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_cyberdemon.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_demon.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_doomglobal.h"
@@ -4074,218 +2184,50 @@
 			<File
 				RelativePath=".\src\g_doom\a_doomimp.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_doommisc.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_doomweaps.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_fatso.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_keen.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_lostsoul.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_painelemental.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_possessed.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_revenant.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_scriptedmarine.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\a_spidermaster.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_doom\doom_sbar.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -4294,38 +2236,10 @@
 			<File
 				RelativePath=".\src\g_raven\a_artitele.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_raven\a_minotaur.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_raven\ravenshared.h"
@@ -4338,56 +2252,14 @@
 			<File
 				RelativePath=".\src\g_heretic\a_chicken.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\a_dsparil.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\a_hereticartifacts.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\a_hereticglobal.h"
@@ -4396,128 +2268,30 @@
 			<File
 				RelativePath=".\src\g_heretic\a_hereticimp.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\a_hereticmisc.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\a_hereticweaps.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\a_ironlich.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\a_knight.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\a_wizard.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_heretic\heretic_sbar.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -4526,254 +2300,58 @@
 			<File
 				RelativePath=".\src\g_hexen\a_bats.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_bishop.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_blastradius.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_boostarmor.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_centaur.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_clericboss.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_clericflame.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_clericholy.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_clericmace.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_clericstaff.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_dragon.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_fighteraxe.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_fighterboss.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_fighterhammer.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\g_hexen\a_fighterplayer.cpp"
@@ -4786,56 +2364,14 @@
 			<File
 				RelativePath=".\src\g_hexen\a_firedemon.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_flechette.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_fog.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\g_hexen\a_healingradius.cpp"
@@ -4844,20 +2380,6 @@
 			<File
 				RelativePath=".\src\g_hexen\a_heresiarch.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_hexenglobal.h"
@@ -4866,146 +2388,34 @@
 			<File
 				RelativePath=".\src\g_hexen\a_hexenspecialdecs.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_iceguy.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_korax.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_mageboss.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_magecone.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_magelightning.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_magestaff.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_magewand.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\g_hexen\a_pig.cpp"
@@ -5014,74 +2424,18 @@
 			<File
 				RelativePath=".\src\g_hexen\a_serpent.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_spike.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_summon.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\g_hexen\a_teleportother.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\g_hexen\a_weaponpieces.cpp"
@@ -5090,20 +2444,6 @@
 			<File
 				RelativePath=".\src\g_hexen\a_wraith.cpp"
 				>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="src\g_hexen\hexen_sbar.cpp"
@@ -5231,110 +2571,26 @@
 				<File
 					RelativePath=".\src\r_bsp.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_data.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_draw.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_drawt.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_main.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_plane.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_polymost.cpp"
@@ -5343,56 +2599,14 @@
 				<File
 					RelativePath=".\src\r_segs.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_sky.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_things.cpp"
 					>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\r_translate.cpp"
@@ -5599,6 +2813,14 @@
 						AdditionalIncludeDirectories="src\win32;$(NoInherit)"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						AdditionalIncludeDirectories="src\win32;$(NoInherit)"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@@ -5608,14 +2830,6 @@
 						AdditionalIncludeDirectories="src\win32;$(NoInherit)"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="src\win32;$(NoInherit)"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -5770,7 +2984,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5778,7 +2992,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5806,7 +3020,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5814,7 +3028,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5843,7 +3057,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5852,7 +3066,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5882,7 +3096,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5890,7 +3104,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5919,7 +3133,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5928,7 +3142,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5959,7 +3173,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5968,7 +3182,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -5998,7 +3212,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6006,7 +3220,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6035,7 +3249,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6044,7 +3258,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6075,7 +3289,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6084,7 +3298,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6115,7 +3329,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6124,7 +3338,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6154,7 +3368,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6162,7 +3376,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6190,7 +3404,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6198,7 +3412,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6226,7 +3440,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6234,7 +3448,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6262,7 +3476,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6270,7 +3484,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6300,7 +3514,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32"
+					Name="Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6310,7 +3524,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -6374,8 +3588,8 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Processing grammar file"
-						CommandLine="tools\lemon\lemon.exe -s &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Description="Generating xlat_parser.c and xlat_parser.h..."
+						CommandLine="tools\lemon\lemon.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="$(InputDir)xlat_parser.c;$(InputDir)xlat_parser.h"
 					/>
 				</FileConfiguration>
@@ -6384,8 +3598,8 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Processing grammar file"
-						CommandLine="tools\lemon\lemon.exe -s &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Description="Generating xlat_parser.c and xlat_parser.h..."
+						CommandLine="tools\lemon\lemon.exe &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 						Outputs="$(InputDir)xlat_parser.c;$(InputDir)xlat_parser.h"
 					/>
 				</FileConfiguration>