From 9aa85743ba769c056bc36e8214dc65c15ac5c45a Mon Sep 17 00:00:00 2001 From: cuz Date: Tue, 27 May 2003 21:48:05 +0000 Subject: [PATCH] Fixed an include file search order problem git-svn-id: svn://svn.cc65.org/cc65/trunk@2173 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/cc65/compile.c | 21 +++------------------ src/cc65/incpath.c | 30 ++++++++++++++++++++++++++---- src/cc65/incpath.h | 11 +++++++---- src/cc65/main.c | 9 ++++++--- 4 files changed, 42 insertions(+), 29 deletions(-) diff --git a/src/cc65/compile.c b/src/cc65/compile.c index 766cd7965..858f855b1 100644 --- a/src/cc65/compile.c +++ b/src/cc65/compile.c @@ -6,9 +6,9 @@ /* */ /* */ /* */ -/* (C) 2000-2002 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ +/* (C) 2000-2003 Ullrich von Bassewitz */ +/* Römerstrasse 52 */ +/* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ /* */ /* */ @@ -51,7 +51,6 @@ #include "expr.h" #include "function.h" #include "global.h" -#include "incpath.h" #include "input.h" #include "litpool.h" #include "macrotab.h" @@ -270,7 +269,6 @@ static void Parse (void) void Compile (const char* FileName) /* Top level compile routine. Will setup things and call the parser. */ { - char* Path; char Buf[20]; char DateStr[20]; char TimeStr[20]; @@ -285,19 +283,6 @@ void Compile (const char* FileName) "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; - /* Add some standard paths to the include search path */ - AddIncludePath ("", INC_USER); /* Current directory */ - AddIncludePath ("include", INC_SYS); -#ifdef CC65_INC - AddIncludePath (CC65_INC, INC_SYS); -#else - AddIncludePath ("/usr/lib/cc65/include", INC_SYS); -#endif - Path = getenv ("CC65_INC"); - if (Path) { - AddIncludePath (Path, INC_SYS | INC_USER); - } - /* Add macros that are always defined */ DefineNumericMacro ("__CC65__", (VER_MAJOR * 0x100) + (VER_MINOR * 0x10) + VER_PATCH); diff --git a/src/cc65/incpath.c b/src/cc65/incpath.c index 767ad2a86..0d2110d6a 100644 --- a/src/cc65/incpath.c +++ b/src/cc65/incpath.c @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 2000 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 2000-2003 Ullrich von Bassewitz */ +/* Römerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -34,6 +34,7 @@ #include +#include #include #if defined(_MSC_VER) /* Microsoft compiler */ @@ -190,3 +191,24 @@ char* FindInclude (const char* Name, unsigned Where) +void InitIncludePaths (void) +/* Initialize the include path search list */ +{ + const char* Path; + + /* Add some standard paths to the include search path */ + AddIncludePath ("", INC_USER); /* Current directory */ + AddIncludePath ("include", INC_SYS); +#ifdef CC65_INC + AddIncludePath (CC65_INC, INC_SYS); +#else + AddIncludePath ("/usr/lib/cc65/include", INC_SYS); +#endif + Path = getenv ("CC65_INC"); + if (Path) { + AddIncludePath (Path, INC_SYS | INC_USER); + } +} + + + diff --git a/src/cc65/incpath.h b/src/cc65/incpath.h index 6e83de21d..2554900c7 100644 --- a/src/cc65/incpath.h +++ b/src/cc65/incpath.h @@ -6,10 +6,10 @@ /* */ /* */ /* */ -/* (C) 2000 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 2000-2003 Ullrich von Bassewitz */ +/* Römerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -63,6 +63,9 @@ char* FindInclude (const char* Name, unsigned Where); * the complete path, if found, return 0 otherwise. */ +void InitIncludePaths (void); +/* Initialize the include path search list */ + /* End of incpath.h */ diff --git a/src/cc65/main.c b/src/cc65/main.c index 9fda4f169..3a548b5cc 100644 --- a/src/cc65/main.c +++ b/src/cc65/main.c @@ -6,9 +6,9 @@ /* */ /* */ /* */ -/* (C) 2000-2002 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ +/* (C) 2000-2003 Ullrich von Bassewitz */ +/* Römerstrasse 52 */ +/* D-70794 Filderstadt */ /* EMail: uz@cc65.org */ /* */ /* */ @@ -655,6 +655,9 @@ int main (int argc, char* argv[]) /* Initialize the default segment names */ InitSegNames (); + /* Initialize the include search paths */ + InitIncludePaths (); + /* Parse the command line */ I = 1; while (I < ArgCount) { -- 2.39.5