Since we have now builtin search paths, we need to be able to forget them,

otherwise we cannot build libraries with a customized version.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4222 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 0aa1b33cc7e1f9f095f78a387f1b809a9c47e9dc..4b45a6c5c1cffd509b70429a37e0aebc22adbf5f 100644 (file)
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -107,6 +107,7 @@ Long options:
   --cpu type           Set cpu type
   --debug-info         Add debug info to object file
   --feature name       Set an emulation feature
+  --forget-inc-paths    Forget include search paths
   --help               Help (this text)
   --ignore-case                Ignore case of symbols
   --include-dir dir    Set an include directory search path
@@ -153,6 +154,13 @@ Here is a description of all the command line options:
   command for a list of emulation features.
 
 
+  <tag><tt>--forget-inc-paths</tt></tag>
+
+  Forget the builtin include paths. This is most useful when building
+  customized assembler modules, in which case the standard header files should
+  be ignored.
+
+
   <label id="option-g">
   <tag><tt>-g, --debug-info</tt></tag>
 

diff --git a/src/ca65/incpath.c b/src/ca65/incpath.c
index 124e4b20be6849c8a6af397ff9ca34a66d095c6b..d3fd72ea3e0478920d668f29192081cee3d087d0 100644 (file)
--- a/src/ca65/incpath.c
+++ b/src/ca65/incpath.c
@@ -76,6 +76,14 @@ char* FindInclude (const char* Name)
 
 
 
+void ForgetAllIncludePaths (void)
+/* Remove all include search paths. */
+{
+    ForgetAllSearchPaths (INC_STD);
+}
+
+
+
 void InitIncludePaths (void)
 /* Initialize the include path search list */
 {

diff --git a/src/ca65/incpath.h b/src/ca65/incpath.h
index 41891c9b856aedfe7cb604d037190562d6ccc52d..b4942ab4d2a256be924fe0787f60896dcab72601 100644 (file)
--- a/src/ca65/incpath.h
+++ b/src/ca65/incpath.h
@@ -52,6 +52,9 @@ char* FindInclude (const char* Name);
  * the complete path, if found, return 0 otherwise.
  */
 
+void ForgetAllIncludePaths (void);
+/* Remove all include search paths. */
+
 void InitIncludePaths (void);
 /* Initialize the include path search list */
 

diff --git a/src/ca65/main.c b/src/ca65/main.c
index faec11ecf8a35ad4efcd4a396b5c48dcc87c39c2..3ec6c16a31755ceb94bb91540fcdb5748a205673 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -108,6 +108,7 @@ static void Usage (void)
             "  --cpu type\t\tSet cpu type\n"
             "  --debug-info\t\tAdd debug info to object file\n"
             "  --feature name\tSet an emulation feature\n"
+            "  --forget-inc-paths\tForget include search paths\n"
             "  --help\t\tHelp (this text)\n"
             "  --ignore-case\t\tIgnore case of symbols\n"
             "  --include-dir dir\tSet an include directory search path\n"
@@ -375,6 +376,15 @@ static void OptFeature (const char* Opt attribute ((unused)), const char* Arg)
 
 
 
+static void OptForgetIncPaths (const char* Opt attribute ((unused)),
+                               const char* Arg attribute ((unused)))
+/* Forget all currently defined include paths */
+{
+    ForgetAllIncludePaths ();
+}
+
+
+
 static void OptHelp (const char* Opt attribute ((unused)),
                     const char* Arg attribute ((unused)))
 /* Print usage information and exit */
@@ -774,6 +784,7 @@ int main (int argc, char* argv [])
         { "--cpu",                     1,      OptCPU                  },
        { "--debug-info",       0,      OptDebugInfo            },
        { "--feature",          1,      OptFeature              },
+               { "--forget-inc-paths", 0,      OptForgetIncPaths       },
        { "--help",             0,      OptHelp                 },
        { "--ignore-case",      0,      OptIgnoreCase           },
        { "--include-dir",      1,      OptIncludeDir           },