diff options
| author | Tim Angus <tim@ngus.net> | 2006-03-21 22:28:25 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2006-03-21 22:28:25 +0000 |
| commit | 64f805804409732a1dade13a37bd1c8fd6083c7d (patch) | |
| tree | 570bec0ce389d740f5054529ce2dc990cb3212a1 | |
| parent | a8b2fb46cb60994714f8316776a3d12b178a9274 (diff) | |
* MinGW fixes merged from ioq3-r652
* Manual updates
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | misc/manual.lyx | 23 | ||||
| -rw-r--r-- | src/tools/lcc/cpp/unix.c | 8 |
3 files changed, 33 insertions, 4 deletions
@@ -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); } |