diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-03 13:54:33 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-02-03 13:54:33 +0000 |
| commit | 1edf99ef5031acb7c0697255fab07f6bd03b48a9 (patch) | |
| tree | 8967c394b1b395fdd093988829fafeb993896830 | |
| parent | 4b2e0cf38f79d89bb80a996f9c04045e08a7db7a (diff) | |
| download | nuttx-1edf99ef5031acb7c0697255fab07f6bd03b48a9.tar.gz nuttx-1edf99ef5031acb7c0697255fab07f6bd03b48a9.tar.bz2 nuttx-1edf99ef5031acb7c0697255fab07f6bd03b48a9.zip | |
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
| -rw-r--r-- | nuttx/arch/z16/src/Makefile | 8 | ||||
| -rw-r--r-- | nuttx/configs/z16f2800100zcog/ostest/Make.defs | 5 | ||||
| -rwxr-xr-x | nuttx/configs/z16f2800100zcog/pashello/Make.defs | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile index 4015025e5..b45fad8b0 100644 --- a/nuttx/arch/z16/src/Makefile +++ b/nuttx/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/nuttx/configs/z16f2800100zcog/ostest/Make.defs b/nuttx/configs/z16f2800100zcog/ostest/Make.defs index 3318ee340..8f506edcf 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/Make.defs +++ b/nuttx/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/nuttx/configs/z16f2800100zcog/pashello/Make.defs b/nuttx/configs/z16f2800100zcog/pashello/Make.defs index 811809c80..d412b6391 100755 --- a/nuttx/configs/z16f2800100zcog/pashello/Make.defs +++ b/nuttx/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 |