bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed an include file search order problem

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@2173 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2003-05-27 21:48:05 +00:00
parent acd09ef19a
commit 9aa85743ba
4 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/cc65/compile.c
View File

@@ -6,9 +6,9 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000-2002 Ullrich von Bassewitz */ /* (C) 2000-2003 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* R<EFBFBD>merstrasse 52 */
/* D-70597 Stuttgart */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
@@ -51,7 +51,6 @@
#include "expr.h" #include "expr.h"
#include "function.h" #include "function.h"
#include "global.h" #include "global.h"
#include "incpath.h"
#include "input.h" #include "input.h"
#include "litpool.h" #include "litpool.h"
#include "macrotab.h" #include "macrotab.h"
@@ -270,7 +269,6 @@ static void Parse (void)
void Compile (const char* FileName) void Compile (const char* FileName)
/* Top level compile routine. Will setup things and call the parser. */ /* Top level compile routine. Will setup things and call the parser. */
{ {
char* Path;
char Buf[20]; char Buf[20];
char DateStr[20]; char DateStr[20];
char TimeStr[20]; char TimeStr[20];
@@ -285,19 +283,6 @@ void Compile (const char* FileName)
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" "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 */ /* Add macros that are always defined */
DefineNumericMacro ("__CC65__", (VER_MAJOR * 0x100) + (VER_MINOR * 0x10) + VER_PATCH); DefineNumericMacro ("__CC65__", (VER_MAJOR * 0x100) + (VER_MINOR * 0x10) + VER_PATCH);

30
src/cc65/incpath.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000 Ullrich von Bassewitz */ /* (C) 2000-2003 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* R<EFBFBD>merstrasse 52 */
/* D-70597 Stuttgart */ /* D-70794 Filderstadt */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -34,6 +34,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#if defined(_MSC_VER) #if defined(_MSC_VER)
/* Microsoft compiler */ /* 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);
}
}

11
src/cc65/incpath.h
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000 Ullrich von Bassewitz */ /* (C) 2000-2003 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* R<EFBFBD>merstrasse 52 */
/* D-70597 Stuttgart */ /* D-70794 Filderstadt */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* 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. * the complete path, if found, return 0 otherwise.
*/ */
void InitIncludePaths (void);
/* Initialize the include path search list */
/* End of incpath.h */ /* End of incpath.h */

9
src/cc65/main.c
View File

@@ -6,9 +6,9 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000-2002 Ullrich von Bassewitz */ /* (C) 2000-2003 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* R<EFBFBD>merstrasse 52 */
/* D-70597 Stuttgart */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
@@ -655,6 +655,9 @@ int main (int argc, char* argv[])
/* Initialize the default segment names */ /* Initialize the default segment names */
InitSegNames (); InitSegNames ();
/* Initialize the include search paths */
InitIncludePaths ();
/* Parse the command line */ /* Parse the command line */
I = 1; I = 1;
while (I < ArgCount) { while (I < ArgCount) {