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

Changed search paths to use subdirectories of CC65_HOME, remove CC65_LIB.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4209 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2009-09-22 11:49:53 +00:00
parent a9e46e245a
commit cb688729af
5 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cc65/incpath.c
View File

@@ -6,10 +6,10 @@
/* */
/* */
/* */
/* (C) 2000-2003 Ullrich von Bassewitz */
/* R<EFBFBD>merstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* (C) 2000-2009, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
@@ -78,13 +78,17 @@ void InitIncludePaths (void)
{
/* Add some standard paths to the include search path */
AddSearchPath ("", INC_USER); /* Current directory */
AddSearchPath ("include", INC_SYS);
/* Add some compiled in search paths if defined at compile time */
#ifdef CC65_INC
AddSearchPath (CC65_INC, INC_SYS);
#else
AddSearchPath ("/usr/lib/cc65/include", INC_SYS);
#endif
/* Add specific paths from the environment */
AddSearchPathFromEnv ("CC65_INC", INC_SYS | INC_USER);
/* Add paths relative to a main directory defined in an env var */
AddSubSearchPathFromEnv ("CC65_HOME", "include", INC_SYS);
}

8
src/cc65/incpath.h
View File

@@ -6,10 +6,10 @@
/* */
/* */
/* */
/* (C) 2000-2003 Ullrich von Bassewitz */
/* R<EFBFBD>merstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* (C) 2000-2009, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */

22
src/ld65/filepath.c
View File

@@ -6,10 +6,10 @@
/* */
/* */
/* */
/* (C) 2003 Ullrich von Bassewitz */
/* R<EFBFBD>merstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* (C) 2003-2009, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
@@ -42,7 +42,7 @@
/*****************************************************************************/
/* Code */
/* Code */
/*****************************************************************************/
@@ -53,7 +53,7 @@ void InitSearchPaths (void)
/* Always search all stuff in the current directory */
AddSearchPath ("", SEARCH_LIB | SEARCH_OBJ | SEARCH_CFG);
/* Add some compiled in search paths if defined on the command line */
/* Add some compiled in search paths if defined at compile time */
#if defined(LD65_LIB)
AddSearchPath (LD65_LIB, SEARCH_LIB);
#endif
@@ -64,13 +64,15 @@ void InitSearchPaths (void)
AddSearchPath (LD65_CFG, SEARCH_CFG);
#endif
/* Add paths from the environment */
/* Add specific paths from the environment */
AddSearchPathFromEnv ("LD65_CFG", SEARCH_CFG);
AddSearchPathFromEnv ("LD65_LIB", SEARCH_LIB);
AddSearchPathFromEnv ("LD65_OBJ", SEARCH_OBJ);
AddSearchPathFromEnv ("LD65_CFG", SEARCH_CFG);
/* Add compatibility stuff */
AddSearchPathFromEnv ("CC65_LIB", SEARCH_LIB | SEARCH_OBJ | SEARCH_CFG);
/* Add paths relative to a main directory defined in an env var */
AddSubSearchPathFromEnv ("CC65_HOME", "cfg", SEARCH_CFG);
AddSubSearchPathFromEnv ("CC65_HOME", "lib", SEARCH_LIB);
AddSubSearchPathFromEnv ("CC65_HOME", "obj", SEARCH_OBJ);
}