diff --git a/src/ca65/incpath.c b/src/ca65/incpath.c index 42e54b2da..8ea67df6f 100644 --- a/src/ca65/incpath.c +++ b/src/ca65/incpath.c @@ -80,5 +80,5 @@ void FinishIncludePaths (void) #endif /* Add paths relative to the parent directory of the Windows binary. */ - AddSubSearchPathFromWinBin (IncSearchPath, "asminc"); + AddSubSearchPathFromBin (IncSearchPath, "asminc"); } diff --git a/src/cc65/incpath.c b/src/cc65/incpath.c index d32614cf9..85f6e070b 100644 --- a/src/cc65/incpath.c +++ b/src/cc65/incpath.c @@ -81,5 +81,5 @@ void FinishIncludePaths (void) #endif /* Add paths relative to the parent directory of the Windows binary. */ - AddSubSearchPathFromWinBin (SysIncSearchPath, "include"); + AddSubSearchPathFromBin (SysIncSearchPath, "include"); } diff --git a/src/cl65/main.c b/src/cl65/main.c index 701355904..5d84fb625 100644 --- a/src/cl65/main.c +++ b/src/cl65/main.c @@ -1218,7 +1218,7 @@ static void OptPrintTargetPath (const char* Opt attribute ((unused)), #if defined(CL65_TGT) && !defined(_WIN32) AddSearchPath (TargetPaths, CL65_TGT); #endif - AddSubSearchPathFromWinBin (TargetPaths, "target"); + AddSubSearchPathFromBin (TargetPaths, "target"); TargetPath = GetSearchPath (TargetPaths, 0); while (*TargetPath) { diff --git a/src/common/searchpath.c b/src/common/searchpath.c index ac507d924..f1ee0b6e2 100644 --- a/src/common/searchpath.c +++ b/src/common/searchpath.c @@ -274,7 +274,7 @@ static char* GetProgPath(char* pathbuf, char* a0) #endif -void AddSubSearchPathFromWinBin (SearchPaths* P, const char* SubDir) +void AddSubSearchPathFromBin (SearchPaths* P, const char* SubDir) { /* Windows only: ** Add a search path from the running binary, adding a subdirectory to diff --git a/src/common/searchpath.h b/src/common/searchpath.h index f078c0799..371388d38 100644 --- a/src/common/searchpath.h +++ b/src/common/searchpath.h @@ -75,9 +75,8 @@ void AddSubSearchPathFromEnv (SearchPaths* P, const char* EnvVar, const char* Su ** the environment variable value. */ -void AddSubSearchPathFromWinBin (SearchPaths* P, const char* SubDir); -/* Windows only: -** Add a search path from the running binary, adding a subdirectory to +void AddSubSearchPathFromBin (SearchPaths* P, const char* SubDir); +/* Add a search path from the running binary, adding a subdirectory to ** the parent directory of the directory containing the binary. */ diff --git a/src/ld65/filepath.c b/src/ld65/filepath.c index f722ad34b..1ceb2333e 100644 --- a/src/ld65/filepath.c +++ b/src/ld65/filepath.c @@ -99,7 +99,7 @@ void InitSearchPaths (void) #endif /* Add paths relative to the parent directory of the Windows binary. */ - AddSubSearchPathFromWinBin (LibDefaultPath, "lib"); - AddSubSearchPathFromWinBin (ObjDefaultPath, "lib"); - AddSubSearchPathFromWinBin (CfgDefaultPath, "cfg"); + AddSubSearchPathFromBin (LibDefaultPath, "lib"); + AddSubSearchPathFromBin (ObjDefaultPath, "lib"); + AddSubSearchPathFromBin (CfgDefaultPath, "cfg"); }