diff options
Diffstat (limited to 'nuttx/configs/z16f2800100zcog/pashello/Make.defs')
-rw-r--r-- | nuttx/configs/z16f2800100zcog/pashello/Make.defs | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/nuttx/configs/z16f2800100zcog/pashello/Make.defs b/nuttx/configs/z16f2800100zcog/pashello/Make.defs index 92a67fa65..d7b93d659 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/Make.defs +++ b/nuttx/configs/z16f2800100zcog/pashello/Make.defs @@ -38,18 +38,27 @@ 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)} @@ -149,13 +158,13 @@ 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 |