3 files changed, 33 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 50330f97..989461c5 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,12 @@ else
   COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/x86/)
 endif
 
+ifeq ($(COMPILE_PLATFORM),mingw32)
+  ifeq ($(COMPILE_ARCH),i386)
+    COMPILE_ARCH=x86
+  endif
+endif
+
 BUILD_CLIENT     =
 BUILD_CLIENT_SMP =
 BUILD_SERVER     =
diff --git a/misc/manual.lyx b/misc/manual.lyx
index 2df59dea..857b36dd 100644
--- a/misc/manual.lyx
+++ b/misc/manual.lyx
@@ -7190,7 +7190,25 @@ Asa
  Kravets -- Manual content, QA, design and balance suggestions
 \layout Standard
 
-'Crylar' -- Concept art
+
+\emph on 
+'Crylar'
+\emph default 
+ -- Concept art
+\layout Standard
+
+Yves 
+\emph on 
+'evillair'
+\emph default 
+ Allaire -- Textures
+\layout Standard
+
+Randy 
+\emph on 
+'ydnar'
+\emph default 
+ Reddig -- Textures
 \layout Standard
 
 Richard 
@@ -7228,8 +7246,7 @@ Also thanks
 
 babyomen, Carc, djbob, Grim, Grytviken, Gumby, heimdall, Hellbringer, Hentai,
  Mighty_Pea, Psylo, Reaper-1, RR2D02, Saig, Smack, T-bone, The GtkRadiant
- people, The inhabitants of Quake3World, ThePyro, TTimo, ValouR, ydnar,
- Yves 'evillair' Allaire
+ people, The inhabitants of Quake3World, ThePyro, TTimo, ValouR
 \layout Standard
 \align center 
 
diff --git a/src/tools/lcc/cpp/unix.c b/src/tools/lcc/cpp/unix.c
index 9d8e5683..b7850df8 100644
--- a/src/tools/lcc/cpp/unix.c
+++ b/src/tools/lcc/cpp/unix.c
@@ -19,6 +19,8 @@ setup(int argc, char **argv)
 	char *fp, *dp;
 	Tokenrow tr;
 	extern void setup_kwtab(void);
+	char *includeDirs[ NINCLUDE ] = { 0 };
+	int   numIncludeDirs = 0;
 
 	setup_kwtab();
 	while ((c = getopt(argc, argv, "MNOVv+I:D:U:F:lg")) != -1)
@@ -29,7 +31,7 @@ setup(int argc, char **argv)
 					includelist[i].deleted = 1;
 			break;
 		case 'I':
-			appendDirToIncludeList( optarg );
+			includeDirs[ numIncludeDirs++ ] = newstring( (uchar *)optarg, strlen( optarg ), 0 );
 			break;
 		case 'D':
 		case 'U':
@@ -73,6 +75,10 @@ setup(int argc, char **argv)
 		setobjname(fp);
 	includelist[NINCLUDE-1].always = 0;
 	includelist[NINCLUDE-1].file = dp;
+
+	for( i = 0; i < numIncludeDirs; i++ )
+		appendDirToIncludeList( includeDirs[ i ] );
+
 	setsource(fp, fd, NULL);
 }