Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / ca65 / incpath.c

diff --git a/src/ca65/incpath.c b/src/ca65/incpath.c
index b69bf23987e2062cd7553e3543ad4b2b938ae6d1..ff21b175dea3f6aa27732a13fb68f1e8fcc78b1a 100644 (file)
--- a/src/ca65/incpath.c
+++ b/src/ca65/incpath.c
@@ -1,12 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                incpath.c                                 */
+/*                                 incpath.c                                 */
 /*                                                                           */
-/*           Include path handling for the ca65 macro assembler             */
+/*            Include path handling for the ca65 macro assembler             */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2010, Ullrich von Bassewitz                                      */
+/* (C) 2000-2013, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -39,49 +39,46 @@
 
 
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-SearchPath*     IncSearchPath;          /* Standard include path */
-SearchPath*     BinSearchPath;          /* Binary include path */
+SearchPaths*    IncSearchPath;          /* Standard include path */
+SearchPaths*    BinSearchPath;          /* Binary include path */
 
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
 
-void ForgetAllIncludePaths (void)
-/* Remove all include search paths. */
-{
-    ForgetSearchPath (IncSearchPath);
-    ForgetSearchPath (BinSearchPath);
-}
-
-
-
 void InitIncludePaths (void)
 /* Initialize the include path search list */
 {
     /* Create the search path lists */
     IncSearchPath = NewSearchPath ();
     BinSearchPath = NewSearchPath ();
+}
 
-    /* Add some compiled in search paths if defined at compile time */
-#ifdef CA65_INC
-    AddSearchPath (IncSearchPath, CA65_INC);
-#endif
 
+
+void FinishIncludePaths (void)
+/* Finish creating the include path search list. */
+{
     /* Add specific paths from the environment */
     AddSearchPathFromEnv (IncSearchPath, "CA65_INC");
 
-    /* Add paths relative to a main directory defined in an env var */
+    /* Add paths relative to a main directory defined in an env. var. */
     AddSubSearchPathFromEnv (IncSearchPath, "CC65_HOME", "asminc");
-}
-
 
+    /* Add some compiled-in search paths if defined at compile time. */
+#if defined(CA65_INC) && !defined(_WIN32)
+    AddSearchPath (IncSearchPath, STRINGIZE (CA65_INC));
+#endif
 
+    /* Add paths relative to the parent directory of the Windows binary. */
+    AddSubSearchPathFromWinBin (IncSearchPath, "asminc");
+}