6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-11-18 00:07:21 +00:00
Code Issues Projects Releases Wiki Activity

Change search paths for the linker.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4193 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2009-09-18 19:00:24 +00:00
parent beef3a3d85
commit 9a4ec37b40
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ld65/filepath.c
View File

@ -41,19 +41,6 @@
/*****************************************************************************/
/* Data */
/*****************************************************************************/
/* If the standard library search path is not given, use a hardcoded one */
#ifndef CC65_LIB
#define CC65_LIB "/usr/lib/cc65/lib/"
#endif
/*****************************************************************************/ /*****************************************************************************/
/* Code */ /* Code */
/*****************************************************************************/ /*****************************************************************************/
@ -66,8 +53,16 @@ void InitSearchPaths (void)
/* Always search all stuff in the current directory */ /* Always search all stuff in the current directory */
AddSearchPath ("", SEARCH_LIB | SEARCH_OBJ | SEARCH_CFG); AddSearchPath ("", SEARCH_LIB | SEARCH_OBJ | SEARCH_CFG);
/* Add a standard path for the libraries and objects */ /* Add some compiled in search paths if defined on the command line */
AddSearchPath (CC65_LIB, SEARCH_LIB | SEARCH_OBJ | SEARCH_CFG); #if defined(LD65_LIB)
AddSearchPath (LD65_LIB, SEARCH_LIB);
#endif
#if defined(LD65_OBJ)
AddSearchPath (LD65_OBJ, SEARCH_OBJ);
#endif
#if defined(LD65_CFG)
AddSearchPath (LD65_CFG, SEARCH_CFG);
#endif
/* Add paths from the environment */ /* Add paths from the environment */
AddSearchPathFromEnv ("LD65_LIB", SEARCH_LIB); AddSearchPathFromEnv ("LD65_LIB", SEARCH_LIB);

10
src/ld65/make/gcc.mak
View File

@ -10,12 +10,14 @@ EXE = ld65
# Library dir # Library dir
COMMON = ../common COMMON = ../common
# The linker library search path. Default is "/usr/lib/cc65/lib/" if nothing # Several search paths. You may redefine these on the command line
# is defined. You may use CC65_LIB=foo on the command line to override it. LD65_LIB = \"/usr/lib/cc65/lib/\"
CC65_LIB = \"/usr/lib/cc65/lib/\" LD65_OBJ = \"/usr/lib/cc65/lib/\"
LD65_CFG = \"/usr/lib/cc65/cfg/\"
# #
CFLAGS = -g -O2 -Wall -W -std=c89 -I$(COMMON) -DCC65_LIB=$(CC65_LIB) CFLAGS = -g -O2 -Wall -W -std=c89 -I$(COMMON)
CFLAGS += -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
CC=gcc CC=gcc
EBIND=emxbind EBIND=emxbind
LDFLAGS= LDFLAGS=