From 7dffca15a180463edfaccce5254be1312654497a Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 3 Feb 2008 13:54:33 +0000 Subject: [PATCH] Changes for clean link of pashello with z16f git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@623 42af7a65-404d-4744-a932-0658087f49c3 --- arch/z16/src/Makefile | 8 +++++--- configs/z16f2800100zcog/ostest/Make.defs | 5 +++++ configs/z16f2800100zcog/pashello/Make.defs | 5 +++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile index 4015025e5f4..b45fad8b02e 100644 --- a/arch/z16/src/Makefile +++ b/arch/z16/src/Makefile @@ -103,11 +103,13 @@ ifeq ($(COMPILER),zneocc.exe) nuttx.linkcmd: $(LINKCMDTEMPLATE) @cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd @echo "\"${shell cygpath -w $(TOPDIR)/nuttx}\"= \\" >>nuttx.linkcmd - @echo " ${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_AOBJ)}, \\" >>nuttx.linkcmd + @echo " \"${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_AOBJ)}\", \\" >>nuttx.linkcmd @( for lib in $(LINKLIBS); do \ - echo " `cygpath -w $(TOPDIR)/$${lib}`, \\" >>nuttx.linkcmd; \ + echo " \"`cygpath -w $(TOPDIR)/$${lib}`\", \\" >>nuttx.linkcmd; \ done ; ) - @echo " ${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}" >>nuttx.linkcmd + @echo " \"${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}\", \\" >>nuttx.linkcmd + @echo " \"${shell cygpath -w $(ZDSSTDLIBDIR)/chelpld$(LIBEXT)}\", \\" >>nuttx.linkcmd + @echo " \"${shell cygpath -w $(ZDSSTDLIBDIR)/fpld$(LIBEXT)}\"" >>nuttx.linkcmd else nuttx.linkcmd: endif diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs index 3318ee3403e..8f506edcfe3 100644 --- a/configs/z16f2800100zcog/ostest/Make.defs +++ b/configs/z16f2800100zcog/ostest/Make.defs @@ -41,6 +41,9 @@ ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.0 ZDSBINDIR := $(ZDSINSTALLDIR)/bin ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog +ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std +ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog + # These are the same directories but with the directory separator # character swapped as needed by the ZNeo-II compiler @@ -48,6 +51,8 @@ ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} +WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} +WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} # Escaped versions diff --git a/configs/z16f2800100zcog/pashello/Make.defs b/configs/z16f2800100zcog/pashello/Make.defs index 811809c805b..d412b6391f7 100755 --- a/configs/z16f2800100zcog/pashello/Make.defs +++ b/configs/z16f2800100zcog/pashello/Make.defs @@ -41,6 +41,9 @@ ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.0 ZDSBINDIR := $(ZDSINSTALLDIR)/bin ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog +ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std +ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog + # These are the same directories but with the directory separator # character swapped as needed by the ZNeo-II compiler @@ -48,6 +51,8 @@ ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} +WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} +WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} # Escaped versions