len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add the target directory tree to the include path, and set the TARGET_TREE macro for the targets that use it

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8945 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2006-03-07 12:45:45 +00:00
parent 3de0db0c3b
commit eed02bebcd
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bootloader/Makefile
View file

@ -7,7 +7,7 @@
# $Id$ # $Id$
# #
INCLUDES= -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(OBJDIR) \ INCLUDES= $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(OBJDIR) \
-I$(BUILDDIR) -I$(BUILDDIR)
DEPFILE = $(OBJDIR)/dep-bootloader DEPFILE = $(OBJDIR)/dep-bootloader

2
firmware/Makefile
View file

@ -7,7 +7,7 @@
# $Id$ # $Id$
# #
INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers -I$(BUILDDIR) INCLUDES=$(TARGET_INC) -Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers -I$(BUILDDIR)
CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(BUILDDATE) $(EXTRA_DEFINES) \ CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET) $(BUILDDATE) $(EXTRA_DEFINES) \
-DMEM=${MEMORYSIZE} -DMEM=${MEMORYSIZE}

14
tools/configure vendored
View file

@ -714,6 +714,11 @@ toolsdir='\$(ROOTDIR)/tools'
# toolset is the tools within the tools directory that we build for # toolset is the tools within the tools directory that we build for
# this particular target. # this particular target.
toolset="$iaudiobitmaptools" toolset="$iaudiobitmaptools"
# architecture, manufacturer and model for the target-tree build
t_cpu="coldfire"
t_manufactorer="iaudio"
t_model="x5"
;; ;;
13) 13)
@ -1075,6 +1080,13 @@ sed > autoconf.h \
#endif /* __BUILD_AUTOCONF_H */ #endif /* __BUILD_AUTOCONF_H */
EOF EOF
if test -n "$t_cpu"; then
TARGET_INC="-I\$(FIRMDIR)/target/$t_cpu/$t_manufactorer/$t_model"
TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu/$t_manufactorer"
TARGET_INC="$TARGET_INC -I\$(FIRMDIR)/target/$t_cpu"
GCCOPTS="$GCCOPTS -DTARGET_TREE"
fi
if test "$simulator" = "yes"; then if test "$simulator" = "yes"; then
# add simul make stuff on the #SIMUL# line # add simul make stuff on the #SIMUL# line
simmagic1="s,@SIMUL1@,@\$(MAKE) -C \$(SIMDIR) OBJDIR=\$(BUILDDIR)/sim," simmagic1="s,@SIMUL1@,@\$(MAKE) -C \$(SIMDIR) OBJDIR=\$(BUILDDIR)/sim,"
@ -1116,6 +1128,7 @@ sed > Makefile \
-e "s,@CODECS@,${codecs},g" \ -e "s,@CODECS@,${codecs},g" \
-e "s,@PROFILE_OPTS@,${PROFILE_OPTS},g" \ -e "s,@PROFILE_OPTS@,${PROFILE_OPTS},g" \
-e "s,@GCCOPTS@,${GCCOPTS},g" \ -e "s,@GCCOPTS@,${GCCOPTS},g" \
-e "s,@TARGET_INC@,${TARGET_INC},g" \
-e "s!@LDOPTS@!${LDOPTS}!g" \ -e "s!@LDOPTS@!${LDOPTS}!g" \
-e "s,@LOADADDRESS@,${loadaddress},g" \ -e "s,@LOADADDRESS@,${loadaddress},g" \
-e "s,@EXTRADEF@,${extradefines},g" \ -e "s,@EXTRADEF@,${extradefines},g" \
@ -1178,6 +1191,7 @@ export DLLWRAP=@DLLWRAP@
export RANLIB=@RANLIB@ export RANLIB=@RANLIB@
export PROFILE_OPTS=@PROFILE_OPTS@ export PROFILE_OPTS=@PROFILE_OPTS@
export GCCOPTS=@GCCOPTS@ export GCCOPTS=@GCCOPTS@
export TARGET_INC=@TARGET_INC@
export LOADADDRESS=@LOADADDRESS@ export LOADADDRESS=@LOADADDRESS@
export SIMVER=@SIMVER@ export SIMVER=@SIMVER@
export SIMDIR=\$(ROOTDIR)/uisimulator/\$(SIMVER) export SIMDIR=\$(ROOTDIR)/uisimulator/\$(SIMVER)