bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Oliver Schmidt
2013-04-27 16:54:09 +02:00
parent 9d6ab944b8
commit ede72d78b2
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ca65/incpath.c
View File

@@ -73,7 +73,7 @@ void InitIncludePaths (void)
/* Add some compiled in search paths if defined at compile time */ /* Add some compiled in search paths if defined at compile time */
#ifdef CA65_INC #ifdef CA65_INC
AddSearchPath (IncSearchPath, CA65_INC); AddSearchPath (IncSearchPath, STRINGIZE (CA65_INC));
#endif #endif
/* Add specific paths from the environment */ /* Add specific paths from the environment */

2
src/cc65/incpath.c
View File

@@ -73,7 +73,7 @@ void InitIncludePaths (void)
/* Add some compiled in search paths if defined at compile time */ /* Add some compiled in search paths if defined at compile time */
#ifdef CC65_INC #ifdef CC65_INC
AddSearchPath (SysIncSearchPath, CC65_INC); AddSearchPath (SysIncSearchPath, STRINGIZE (CC65_INC));
#endif #endif
/* Add specific paths from the environment */ /* Add specific paths from the environment */

4
src/common/searchpath.h
View File

@@ -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 */ /* A search path is a pointer to the list */
typedef struct Collection SearchPath; typedef struct Collection SearchPath;

6
src/ld65/filepath.c
View File

@@ -71,13 +71,13 @@ void InitSearchPaths (void)
/* Add some compiled in search paths if defined at compile time */ /* Add some compiled in search paths if defined at compile time */
#if defined(LD65_LIB) #if defined(LD65_LIB)
AddSearchPath (LibSearchPath, LD65_LIB); AddSearchPath (LibSearchPath, STRINGIZE (LD65_LIB));
#endif #endif
#if defined(LD65_OBJ) #if defined(LD65_OBJ)
AddSearchPath (ObjSearchPath, LD65_OBJ); AddSearchPath (ObjSearchPath, STRINGIZE (LD65_OBJ));
#endif #endif
#if defined(LD65_CFG) #if defined(LD65_CFG)
AddSearchPath (CfgSearchPath, LD65_CFG); AddSearchPath (CfgSearchPath, STRINGIZE (LD65_CFG));
#endif #endif
/* Add specific paths from the environment */ /* Add specific paths from the environment */