6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-12 17:30:50 +00:00
Code Issues Projects Releases Wiki Activity

Don't use hardcoded paths on Amiga

Browse Source 
Hardcoded paths don't make sense on AmigaOS, AROS and MorphOS.
This commit is contained in:
Ola Söder 2023-04-07 23:44:30 +02:00
parent 19349acdcf
commit 2a7533268c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ca65/incpath.c
View File

@ -75,7 +75,7 @@ void FinishIncludePaths (void)
AddSubSearchPathFromEnv (IncSearchPath, "CC65_HOME", "asminc"); AddSubSearchPathFromEnv (IncSearchPath, "CC65_HOME", "asminc");
/* Add some compiled-in search paths if defined at compile time. */ /* Add some compiled-in search paths if defined at compile time. */
#if defined(CA65_INC) && !defined(_WIN32) #if defined(CA65_INC) && !defined(_WIN32) && !defined(_AMIGA)
AddSearchPath (IncSearchPath, CA65_INC); AddSearchPath (IncSearchPath, CA65_INC);
#endif #endif

2
src/cc65/incpath.c
View File

@ -76,7 +76,7 @@ void FinishIncludePaths (void)
AddSubSearchPathFromEnv (SysIncSearchPath, "CC65_HOME", "include"); AddSubSearchPathFromEnv (SysIncSearchPath, "CC65_HOME", "include");
/* Add some compiled-in search paths if defined at compile time. */ /* Add some compiled-in search paths if defined at compile time. */
#if defined(CC65_INC) && !defined(_WIN32) #if defined(CC65_INC) && !defined(_WIN32) && !defined(_AMIGA)
AddSearchPath (SysIncSearchPath, CC65_INC); AddSearchPath (SysIncSearchPath, CC65_INC);
#endif #endif

2
src/cl65/main.c
View File

@ -1216,7 +1216,7 @@ static void OptPrintTargetPath (const char* Opt attribute ((unused)),
SearchPaths* TargetPaths = NewSearchPath (); SearchPaths* TargetPaths = NewSearchPath ();
AddSubSearchPathFromEnv (TargetPaths, "CC65_HOME", "target"); AddSubSearchPathFromEnv (TargetPaths, "CC65_HOME", "target");
#if defined(CL65_TGT) && !defined(_WIN32) #if defined(CL65_TGT) && !defined(_WIN32) && !defined(_AMIGA)
AddSearchPath (TargetPaths, CL65_TGT); AddSearchPath (TargetPaths, CL65_TGT);
#endif #endif
AddSubSearchPathFromBin (TargetPaths, "target"); AddSubSearchPathFromBin (TargetPaths, "target");

6
src/ld65/filepath.c
View File

@ -88,13 +88,13 @@ void InitSearchPaths (void)
AddSubSearchPathFromEnv (CfgDefaultPath, "CC65_HOME", "cfg"); AddSubSearchPathFromEnv (CfgDefaultPath, "CC65_HOME", "cfg");
/* 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) && !defined(_WIN32) #if defined(LD65_LIB) && !defined(_WIN32) && !defined(_AMIGA)
AddSearchPath (LibDefaultPath, LD65_LIB); AddSearchPath (LibDefaultPath, LD65_LIB);
#endif #endif
#if defined(LD65_OBJ) && !defined(_WIN32) #if defined(LD65_OBJ) && !defined(_WIN32) && !defined(_AMIGA)
AddSearchPath (ObjDefaultPath, LD65_OBJ); AddSearchPath (ObjDefaultPath, LD65_OBJ);
#endif #endif
#if defined(LD65_CFG) && !defined(_WIN32) #if defined(LD65_CFG) && !defined(_WIN32) && !defined(_AMIGA)
AddSearchPath (CfgDefaultPath, LD65_CFG); AddSearchPath (CfgDefaultPath, LD65_CFG);
#endif #endif