Allow to supply searchpath defines as simple values instead of escaped C strings.

diff --git a/src/ca65/incpath.c b/src/ca65/incpath.c
index b69bf23987e2062cd7553e3543ad4b2b938ae6d1..ab0db844301e1b706dc2088fc0e631f8352630e4 100644 (file)
--- a/src/ca65/incpath.c
+++ b/src/ca65/incpath.c
@@ -73,7 +73,7 @@ void InitIncludePaths (void)
 
     /* Add some compiled in search paths if defined at compile time */
 #ifdef CA65_INC
-    AddSearchPath (IncSearchPath, CA65_INC);
+    AddSearchPath (IncSearchPath, STRINGIZE (CA65_INC));
 #endif
 
     /* Add specific paths from the environment */

diff --git a/src/cc65/incpath.c b/src/cc65/incpath.c
index 8b3596fdd4b94eac555a33e57e9bf63d59647ab0..275fc844d1adf18c122924e17ae34ff5ea1cd36c 100644 (file)
--- a/src/cc65/incpath.c
+++ b/src/cc65/incpath.c
@@ -73,7 +73,7 @@ void InitIncludePaths (void)
 
     /* Add some compiled in search paths if defined at compile time */
 #ifdef CC65_INC
-    AddSearchPath (SysIncSearchPath, CC65_INC);
+    AddSearchPath (SysIncSearchPath, STRINGIZE (CC65_INC));
 #endif
 
     /* Add specific paths from the environment */

diff --git a/src/common/searchpath.h b/src/common/searchpath.h
index f9f8705634e8bc69a22b7cf8a386f66e70b4058e..f162b06eebbc9f89d05ac5051a0cf1c217eda122 100644 (file)
--- a/src/common/searchpath.h
+++ b/src/common/searchpath.h
@@ -48,6 +48,10 @@
 
 
 
+/* Convert argument to C string */
+#define _STRINGIZE(arg) #arg
+#define  STRINGIZE(arg) _STRINGIZE(arg)
+
 /* A search path is a pointer to the list */
 typedef struct Collection SearchPath;
 

diff --git a/src/ld65/filepath.c b/src/ld65/filepath.c
index aa7d547e275f50f441e2020ff40acbe5f088a3af..efed463eed1c4d4e6264247434016071fe09d892 100644 (file)
--- a/src/ld65/filepath.c
+++ b/src/ld65/filepath.c
@@ -71,13 +71,13 @@ void InitSearchPaths (void)
 
     /* Add some compiled in search paths if defined at compile time */
 #if defined(LD65_LIB)
-    AddSearchPath (LibSearchPath, LD65_LIB);
+    AddSearchPath (LibSearchPath, STRINGIZE (LD65_LIB));
 #endif
 #if defined(LD65_OBJ)
-    AddSearchPath (ObjSearchPath, LD65_OBJ);
+    AddSearchPath (ObjSearchPath, STRINGIZE (LD65_OBJ));
 #endif
 #if defined(LD65_CFG)
-    AddSearchPath (CfgSearchPath, LD65_CFG);
+    AddSearchPath (CfgSearchPath, STRINGIZE (LD65_CFG));
 #endif
 
     /* Add specific paths from the environment */