Improve MinGW support.

[cc65] / src / ld65 / filepath.c

diff --git a/src/ld65/filepath.c b/src/ld65/filepath.c
index 803efbf2dc16a30d476739cbf1547e9017b77e5b..1010023f2ccf6c61cda788f4b4b10411ecbfb296 100644 (file)
--- a/src/ld65/filepath.c
+++ b/src/ld65/filepath.c
@@ -1,6 +1,6 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                filepath.c                                */
+/*                                 filepath.c                                */
 /*                                                                           */
 /*                    File search path handling for ld65                     */
 /*                                                                           */
@@ -39,23 +39,23 @@
 
 
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-SearchPath*      LibSearchPath;         /* Library path */
-SearchPath*      ObjSearchPath;         /* Object file path */
-SearchPath*      CfgSearchPath;         /* Config file path */
+SearchPaths*     LibSearchPath;         /* Library path */
+SearchPaths*     ObjSearchPath;         /* Object file path */
+SearchPaths*     CfgSearchPath;         /* Config file path */
 
-SearchPath*      LibDefaultPath;        /* Default Library path */
-SearchPath*      ObjDefaultPath;        /* Default Object file path */
-SearchPath*      CfgDefaultPath;        /* Default Config file path */
+SearchPaths*     LibDefaultPath;        /* Default Library path */
+SearchPaths*     ObjDefaultPath;        /* Default Object file path */
+SearchPaths*     CfgDefaultPath;        /* Default Config file path */
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -88,13 +88,13 @@ void InitSearchPaths (void)
     AddSubSearchPathFromEnv (CfgDefaultPath, "CC65_HOME", "cfg");
 
     /* Add some compiled-in search paths if defined at compile time. */
-#if defined(LD65_LIB)
+#if defined(LD65_LIB) && !defined(_WIN32)
     AddSearchPath (LibDefaultPath, STRINGIZE (LD65_LIB));
 #endif
-#if defined(LD65_OBJ)
+#if defined(LD65_OBJ) && !defined(_WIN32)
     AddSearchPath (ObjDefaultPath, STRINGIZE (LD65_OBJ));
 #endif
-#if defined(LD65_CFG)
+#if defined(LD65_CFG) && !defined(_WIN32)
     AddSearchPath (CfgDefaultPath, STRINGIZE (LD65_CFG));
 #endif