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

19
doc/cc65.sgml
View File

@@ -399,9 +399,22 @@ the same base name, but with the extension replaced by ".s". The output
file contains assembler code suitable for the use with the ca65 macro file contains assembler code suitable for the use with the ca65 macro
assembler. assembler.
In addition to the paths named in the <tt/-I/ option on the command line, the Include files in single quotes are searched in the following places:
directory named in the environment variable <tt/CC65_INC/ is added to the <enum>
search path for include files on startup. <item>The current directory.
<item>The value of the environment variable <tt/CC65_INC/ if it is defined.
<item>Any directory added with the <tt/-I/ option on the command line.
</enum>
Include files in angle brackets are searched in the following places:
<enum>
<item>A compiled in directory which is often <tt>/usr/lib/cc65/include</tt> on
Linux systems.
<item>The value of the environment variable <tt/CC65_INC/ if it is defined.
<item>A subdirectory named <tt/include/ of the directory defined in the
environment variable <tt/CC65_HOME/, if it is defined.
<item>Any directory added with the <tt/-I/ option on the command line.
</enum>

17
doc/ld65.sgml
View File

@@ -324,9 +324,8 @@ The library search path contains in this order:
<item>A compiled in library path which is often <tt>/usr/lib/cc65/lib</tt> on <item>A compiled in library path which is often <tt>/usr/lib/cc65/lib</tt> on
Linux systems. Linux systems.
<item>The value of the environment variable <tt/LD65_LIB/ if it is defined. <item>The value of the environment variable <tt/LD65_LIB/ if it is defined.
<item>The value of the environment variable <tt/CC65_LIB/ if it is defined. <item>A subdirectory named <tt/lib/ of the directory defined in the environment
Please note that use of this environment variable is obsolete and may variable <tt/CC65_HOME/, if it is defined.
get removed in future versions.
<item>Any directory added with the <tt><ref id="option--lib-path" <item>Any directory added with the <tt><ref id="option--lib-path"
name="--lib-path"></tt> option on the command line. name="--lib-path"></tt> option on the command line.
</enum> </enum>
@@ -338,12 +337,11 @@ The object file search path contains in this order:
<enum> <enum>
<item>The current directory. <item>The current directory.
<item>A compiled in directory which is often <tt>/usr/lib/cc65/lib</tt> on <item>A compiled in directory which is often <tt>/usr/lib/cc65/obj</tt> on
Linux systems. Linux systems.
<item>The value of the environment variable <tt/LD65_OBJ/ if it is defined. <item>The value of the environment variable <tt/LD65_OBJ/ if it is defined.
<item>The value of the environment variable <tt/CC65_LIB/ if it is defined. <item>A subdirectory named <tt/obj/ of the directory defined in the environment
Please note that use of this environment variable is obsolete and may variable <tt/CC65_HOME/, if it is defined.
get removed in future versions.
<item>Any directory added with the <tt><ref id="option--obj-path" <item>Any directory added with the <tt><ref id="option--obj-path"
name="--obj-path"></tt> option on the command line. name="--obj-path"></tt> option on the command line.
</enum> </enum>
@@ -358,9 +356,8 @@ The config file search path contains in this order:
<item>A compiled in directory which is often <tt>/usr/lib/cc65/cfg</tt> on <item>A compiled in directory which is often <tt>/usr/lib/cc65/cfg</tt> on
Linux systems. Linux systems.
<item>The value of the environment variable <tt/LD65_CFG/ if it is defined. <item>The value of the environment variable <tt/LD65_CFG/ if it is defined.
<item>The value of the environment variable <tt/CC65_LIB/ if it is defined. <item>A subdirectory named <tt/cfg/ of the directory defined in the environment
Please note that use of this environment variable is obsolete and may variable <tt/CC65_HOME/, if it is defined.
get removed in future versions.
<item>Any directory added with the <tt><ref id="option--cfg-path" <item>Any directory added with the <tt><ref id="option--cfg-path"
name="--cfg-path"></tt> option on the command line. name="--cfg-path"></tt> option on the command line.
</enum> </enum>

14
src/cc65/incpath.c
View File

@@ -6,8 +6,8 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000-2003 Ullrich von Bassewitz */ /* (C) 2000-2009, Ullrich von Bassewitz */
/* R<EFBFBD>merstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
@@ -78,13 +78,17 @@ void InitIncludePaths (void)
{ {
/* Add some standard paths to the include search path */ /* Add some standard paths to the include search path */
AddSearchPath ("", INC_USER); /* Current directory */ AddSearchPath ("", INC_USER); /* Current directory */
AddSearchPath ("include", INC_SYS);
/* Add some compiled in search paths if defined at compile time */
#ifdef CC65_INC #ifdef CC65_INC
AddSearchPath (CC65_INC, INC_SYS); AddSearchPath (CC65_INC, INC_SYS);
#else
AddSearchPath ("/usr/lib/cc65/include", INC_SYS);
#endif #endif
/* Add specific paths from the environment */
AddSearchPathFromEnv ("CC65_INC", INC_SYS | INC_USER); 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);
} }

4
src/cc65/incpath.h
View File

@@ -6,8 +6,8 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000-2003 Ullrich von Bassewitz */ /* (C) 2000-2009, Ullrich von Bassewitz */
/* R<EFBFBD>merstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */

16
src/ld65/filepath.c
View File

@@ -6,8 +6,8 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2003 Ullrich von Bassewitz */ /* (C) 2003-2009, Ullrich von Bassewitz */
/* R<EFBFBD>merstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
@@ -53,7 +53,7 @@ void InitSearchPaths (void)
/* Always search all stuff in the current directory */ /* Always search all stuff in the current directory */
AddSearchPath ("", SEARCH_LIB | SEARCH_OBJ | SEARCH_CFG); 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) #if defined(LD65_LIB)
AddSearchPath (LD65_LIB, SEARCH_LIB); AddSearchPath (LD65_LIB, SEARCH_LIB);
#endif #endif
@@ -64,13 +64,15 @@ void InitSearchPaths (void)
AddSearchPath (LD65_CFG, SEARCH_CFG); AddSearchPath (LD65_CFG, SEARCH_CFG);
#endif #endif
/* Add paths from the environment */ /* Add specific paths from the environment */
AddSearchPathFromEnv ("LD65_CFG", SEARCH_CFG);
AddSearchPathFromEnv ("LD65_LIB", SEARCH_LIB); AddSearchPathFromEnv ("LD65_LIB", SEARCH_LIB);
AddSearchPathFromEnv ("LD65_OBJ", SEARCH_OBJ); AddSearchPathFromEnv ("LD65_OBJ", SEARCH_OBJ);
AddSearchPathFromEnv ("LD65_CFG", SEARCH_CFG);
/* Add compatibility stuff */ /* Add paths relative to a main directory defined in an env var */
AddSearchPathFromEnv ("CC65_LIB", SEARCH_LIB | SEARCH_OBJ | SEARCH_CFG); AddSubSearchPathFromEnv ("CC65_HOME", "cfg", SEARCH_CFG);
AddSubSearchPathFromEnv ("CC65_HOME", "lib", SEARCH_LIB);
AddSubSearchPathFromEnv ("CC65_HOME", "obj", SEARCH_OBJ);
} }