From dbdd16d1d750f47a60d1875154f79fd1dd702471 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 --- configs/z16f2800100zcog/ostest/Make.defs | 5 +++++ configs/z16f2800100zcog/pashello/Make.defs | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs index 3318ee3403..8f506edcfe 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 811809c805..d412b6391f 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