diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 23:44:31 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 23:44:31 +0000 |
commit | 96e153c0d29b1ab3657948e280faa25e864b28c5 (patch) | |
tree | 121d4fdf55df9d292c0d1d3971b2c5252cf39eaa /nuttx/configs/z16f2800100zcog/ostest | |
parent | dab0480f31b5fe4d778a414f3b60e5c5b536b1bd (diff) | |
download | px4-nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.tar.gz px4-nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.tar.bz2 px4-nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.zip |
Correct some issues with last check-in; ez80 still does not build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5339 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/z16f2800100zcog/ostest')
-rw-r--r-- | nuttx/configs/z16f2800100zcog/ostest/Make.defs | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/nuttx/configs/z16f2800100zcog/ostest/Make.defs b/nuttx/configs/z16f2800100zcog/ostest/Make.defs index 7f86dd29f..79fa655bb 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/Make.defs +++ b/nuttx/configs/z16f2800100zcog/ostest/Make.defs @@ -38,23 +38,32 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZNeo-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_ZNEO_4.11.1 +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZNeo-II compiler -WINTOOL := y -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)} +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 @@ -133,35 +142,35 @@ EXEEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lst endef # This is the tool to use for dependencies (i.e., none) |