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 76ad3111af70377bd99d4ff931068672fe193447..ff21b175dea3f6aa27732a13fb68f1e8fcc78b1a 100644 (file)
--- a/src/ca65/incpath.c
+++ b/src/ca65/incpath.c
@@ -44,8 +44,8 @@
 
 
 
-SearchPath*     IncSearchPath;          /* Standard include path */
-SearchPath*     BinSearchPath;          /* Binary include path */
+SearchPaths*    IncSearchPath;          /* Standard include path */
+SearchPaths*    BinSearchPath;          /* Binary include path */
 
 
 
@@ -75,13 +75,10 @@ void FinishIncludePaths (void)
     AddSubSearchPathFromEnv (IncSearchPath, "CC65_HOME", "asminc");
 
     /* Add some compiled-in search paths if defined at compile time. */
-#ifdef CA65_INC
+#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");
 }
-
-
-