You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/02/21 01:24:45 UTC
[incubator-nuttx] branch master updated (d129be9 -> e55118d)
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from d129be9 boards/z80/ez80: Correct errors in README.txt files.
new 231720d boards/z80/ez80: Consolidate toolchain path definitions
new e55118d boards/z80/ez80/*/scripts/Make.defs: Clean-up ARCHIVE define
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/z80/src/ez80/Toolchain.defs | 60 +++++++++++++++++-
boards/z80/ez80/ez80f910200kitg/scripts/Make.defs | 71 ++-------------------
boards/z80/ez80/ez80f910200zco/scripts/Make.defs | 71 ++-------------------
boards/z80/ez80/makerlisp/scripts/Make.defs | 77 +++--------------------
4 files changed, 80 insertions(+), 199 deletions(-)
[incubator-nuttx] 02/02: boards/z80/ez80/*/scripts/Make.defs:
Clean-up ARCHIVE define
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit e55118d96d747b9a5bf6a59a2911c6b9544de8ed
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Fri Feb 21 02:18:41 2020 +0000
boards/z80/ez80/*/scripts/Make.defs: Clean-up ARCHIVE define
---
boards/z80/ez80/ez80f910200kitg/scripts/Make.defs | 6 +++---
boards/z80/ez80/ez80f910200zco/scripts/Make.defs | 6 +++---
boards/z80/ez80/makerlisp/scripts/Make.defs | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
index 6d0dc98..3153a63 100644
--- a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
@@ -149,7 +149,7 @@ define MOVEOBJ
endef
define ARCHIVE
- for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
+ $(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -183,8 +183,8 @@ define MOVEOBJ
endef
define ARCHIVE
- for __obj in $(2) ; do \
- $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(Q) for __obj in $(2) ; do \
+ $(AR) $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
index ab2dc8e..cafbc4d 100644
--- a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
@@ -149,7 +149,7 @@ define MOVEOBJ
endef
define ARCHIVE
- for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
+ $(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -183,8 +183,8 @@ define MOVEOBJ
endef
define ARCHIVE
- for __obj in $(2) ; do \
- $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(Q) for __obj in $(2) ; do \
+ $(AR) $(ARFLAGS) $1=-+$$__obj \
done
endef
diff --git a/boards/z80/ez80/makerlisp/scripts/Make.defs b/boards/z80/ez80/makerlisp/scripts/Make.defs
index e73ef79..a588788 100644
--- a/boards/z80/ez80/makerlisp/scripts/Make.defs
+++ b/boards/z80/ez80/makerlisp/scripts/Make.defs
@@ -157,7 +157,7 @@ define MOVEOBJ
endef
define ARCHIVE
- for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
+ $(Q) for %%G in ($(2)) do ( $(AR) $(ARFLAGS) $1=-+%%G )
endef
define CLEAN
@@ -191,8 +191,8 @@ define MOVEOBJ
endef
define ARCHIVE
- for __obj in $(2) ; do \
- $(AR) $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+ $(Q) for __obj in $(2) ; do \
+ $(AR) $(ARFLAGS) $1=-+$$__obj \
done
endef
[incubator-nuttx] 01/02: boards/z80/ez80: Consolidate toolchain
path definitions
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 231720d3307dc9e4d8d976187c0dfbb98c381255
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Fri Feb 21 02:17:35 2020 +0000
boards/z80/ez80: Consolidate toolchain path definitions
---
arch/z80/src/ez80/Toolchain.defs | 60 ++++++++++++++++++-
boards/z80/ez80/ez80f910200kitg/scripts/Make.defs | 65 +--------------------
boards/z80/ez80/ez80f910200zco/scripts/Make.defs | 65 +--------------------
boards/z80/ez80/makerlisp/scripts/Make.defs | 71 ++---------------------
4 files changed, 71 insertions(+), 190 deletions(-)
diff --git a/arch/z80/src/ez80/Toolchain.defs b/arch/z80/src/ez80/Toolchain.defs
index bc68e47..e8d6f5a 100644
--- a/arch/z80/src/ez80/Toolchain.defs
+++ b/arch/z80/src/ez80/Toolchain.defs
@@ -1,7 +1,7 @@
############################################################################
# arch/z80/src/ez80/Toolchain.defs
#
-# Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
+# Copyright (C) 2012, 2016, 2020 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gn...@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -45,3 +45,61 @@ CONFIG_EZ80_TOOLCHAIN ?= ZDSII
ifeq ($(CONFIG_WINDOWS_CYGWIN),y)
WINTOOL = y
endif
+
+# These are the default directories where the ZDS-II toolchain is installed.
+# NOTE that short 8.3 path names are used in order to avoid spaces. On my
+# machine I have:
+#
+# Versions 5.1.1 and 5.2.1
+# C:\PROGRA~1\ = C:\Program Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
+#
+# Version 5.3.0 and 5.3.3, the default install location is C:\ZiLOG
+
+ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
+INSTALLROOT = C:/PROGRA~2/ZiLOG
+ZDSVERSION := 5.1.1
+else ifeq ($(CONFIG_EZ80_ZDSII_V521),y)
+INSTALLROOT = C:/PROGRA~2/ZiLOG
+ZDSVERSION := 5.2.1
+else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
+INSTALLROOT = C:/ZiLOG
+ZDSVERSION := 5.3.0
+else ifeq ($(CONFIG_EZ80_ZDSII_V533),y)
+INSTALLROOT = C:/ZiLOG
+ZDSVERSION := 5.3.3
+endif
+
+ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+ INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
+ ZDSBINDIR := $(INSTALLDIR)\bin
+ ZDSSTDINCDIR := $(INSTALLDIR)\include\std
+ ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
+ ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
+ ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
+else
+ INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
+ ZDSBINDIR := $(INSTALLDIR)/bin
+ ZDSSTDINCDIR := $(INSTALLDIR)/include/std
+ ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
+ ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
+ ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
+
+ # These are the same directories but with the directory separator
+ # character swapped as needed by the ZDS-II compiler
+
+ 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
+
+ ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
+ EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
+ EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
+endif
diff --git a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
index b3c1e84..6d0dc98 100644
--- a/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
@@ -1,7 +1,7 @@
############################################################################
# boards/z80/ez80/ez80f910200kitg/scripts/Make.defs
#
-# Copyright (C) 2008, 2009, 2013 Gregory Nutt. All rights reserved.
+# Copyright (C) 2008, 2009, 2013, 2020 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gn...@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -35,75 +35,16 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
+include ${TOPDIR}/arch/z80/src/ez80/Toolchain.defs
-# These are the default directories where the ZDS-II toolchain is installed.
-# NOTE that short 8.3 path names are used in order to avoid spaces. On my
-# machine I have:
-#
-# Versions 5.1.1 and 5.2.1
-# C:\PROGRA~1\ = C:\Program Files\
-# C:\PROGRA~2\ = C:\Program Files (x86)\
-#
-# Your PC may be configured differently.
-#
-# Version 5.3.0 and 5.3.3, the default install location is C:\ZiLOG
-
-ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
-INSTALLROOT = C:/PROGRA~2/ZiLOG
-ZDSVERSION := 5.1.1
-else ifeq ($(CONFIG_EZ80_ZDSII_V521),y)
-INSTALLROOT = C:/PROGRA~2/ZiLOG
-ZDSVERSION := 5.2.1
-else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
-INSTALLROOT = C:/ZiLOG
-ZDSVERSION := 5.3.0
-else ifeq ($(CONFIG_EZ80_ZDSII_V533),y)
-INSTALLROOT = C:/ZiLOG
-ZDSVERSION := 5.3.3
-endif
+# CFLAGS
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
- INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
- ZDSBINDIR := $(INSTALLDIR)\bin
- ZDSSTDINCDIR := $(INSTALLDIR)\include\std
- ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
- ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
- ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
-
- # CFLAGS
-
ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
ARCHUSRINCLUDES = -usrinc:.
else
- WINTOOL := y
- ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
- INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
- ZDSBINDIR := $(INSTALLDIR)/bin
- ZDSSTDINCDIR := $(INSTALLDIR)/include/std
- ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
- ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
- ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
-
- # These are the same directories but with the directory separator
- # character swapped as needed by the ZDS-II compiler
-
- 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
-
- ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
- EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
- EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
-
- # CFLAGs
-
ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
diff --git a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
index 678748a..ab2dc8e 100644
--- a/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
+++ b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs
@@ -1,7 +1,7 @@
############################################################################
# boards/z80/ez80/ez80f910200zco/scripts/Make.defs
#
-# Copyright (C) 2009, 2012-2013 Gregory Nutt. All rights reserved.
+# Copyright (C) 2009, 2012-2013, 2020 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gn...@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -35,75 +35,16 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
+include ${TOPDIR}/arch/z80/src/ez80/Toolchain.defs
-# These are the default directories where the ZDS-II toolchain is installed.
-# NOTE that short 8.3 path names are used in order to avoid spaces. On my
-# machine I have:
-#
-# Versions 5.1.1 and 5.2.1
-# C:\PROGRA~1\ = C:\Program Files\
-# C:\PROGRA~2\ = C:\Program Files (x86)\
-#
-# Your PC may be configured differently.
-#
-# Version 5.3.0 and 5.3.3, the default install location is C:\ZiLOG
-
-ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
-INSTALLROOT = C:/PROGRA~2/ZiLOG
-ZDSVERSION := 5.1.1
-else ifeq ($(CONFIG_EZ80_ZDSII_V521),y)
-INSTALLROOT = C:/PROGRA~2/ZiLOG
-ZDSVERSION := 5.2.1
-else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
-INSTALLROOT = C:/ZiLOG
-ZDSVERSION := 5.3.0
-else ifeq ($(CONFIG_EZ80_ZDSII_V533),y)
-INSTALLROOT = C:/ZiLOG
-ZDSVERSION := 5.3.3
-endif
+# CFLAGS
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
- INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
- ZDSBINDIR := $(INSTALLDIR)\bin
- ZDSSTDINCDIR := $(INSTALLDIR)\include\std
- ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
- ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
- ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
-
- # CFLAGS
-
ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
ARCHUSRINCLUDES = -usrinc:.
else
- WINTOOL := y
- ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
- INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
- ZDSBINDIR := $(INSTALLDIR)/bin
- ZDSSTDINCDIR := $(INSTALLDIR)/include/std
- ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
- ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
- ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
-
- # These are the same directories but with the directory separator
- # character swapped as needed by the ZDS-II compiler
-
- 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
-
- ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
- EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
- EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
-
- # CFLAGs
-
ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
diff --git a/boards/z80/ez80/makerlisp/scripts/Make.defs b/boards/z80/ez80/makerlisp/scripts/Make.defs
index bb86693..e73ef79 100644
--- a/boards/z80/ez80/makerlisp/scripts/Make.defs
+++ b/boards/z80/ez80/makerlisp/scripts/Make.defs
@@ -1,7 +1,7 @@
############################################################################
# boards/z80/ez80/makerlisp/scripts/Make.defs
#
-# Copyright (C) 2019 Gregory Nutt. All rights reserved.
+# Copyright (C) 2019, 2020 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gn...@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -35,78 +35,19 @@
include $(TOPDIR)/.config
include $(TOPDIR)/tools/Config.mk
+include ${TOPDIR}/arch/z80/src/ez80/Toolchain.defs
-# These are the default directories where the ZDS-II toolchain is installed.
-# NOTE that short 8.3 path names are used in order to avoid spaces. On my
-# machine I have:
-#
-# Versions 5.1.1 and 5.2.1
-# C:\PROGRA~1\ = C:\Program Files\
-# C:\PROGRA~2\ = C:\Program Files (x86)\
-#
-# Your PC may be configured differently.
-#
-# Version 5.3.0 and 5.3.3, the default install location is C:\ZiLOG
-
-ifeq ($(CONFIG_EZ80_ZDSII_V511),y)
-INSTALLROOT = C:/PROGRA~2/ZiLOG
-ZDSVERSION := 5.1.1
-else ifeq ($(CONFIG_EZ80_ZDSII_V521),y)
-INSTALLROOT = C:/PROGRA~2/ZiLOG
-ZDSVERSION := 5.2.1
-else ifeq ($(CONFIG_EZ80_ZDSII_V530),y)
-INSTALLROOT = C:/ZiLOG
-ZDSVERSION := 5.3.0
-else ifeq ($(CONFIG_EZ80_ZDSII_V533),y)
-INSTALLROOT = C:/ZiLOG
-ZDSVERSION := 5.3.3
-endif
+# CFLAGS
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
- INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
- ZDSBINDIR := $(INSTALLDIR)\bin
- ZDSSTDINCDIR := $(INSTALLDIR)\include\std
- ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
- ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
- ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
-
- # CFLAGS
-
ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
ARCHUSRINCLUDES = -usrinc:.
else
- WINTOOL := y
- ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
- INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
- ZDSBINDIR := $(INSTALLDIR)/bin
- ZDSSTDINCDIR := $(INSTALLDIR)/include/std
- ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
- ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
- ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
-
- # These are the same directories but with the directory separator
- # character swapped as needed by the ZDS-II compiler
-
- 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
-
- ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
- EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
- EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
-
- # CFLAGs
-
- ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
- EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
- ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+ ARCHASMINCLUDES = -include:'$(WTOPDIR)/include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+ EARCHASMINCLUDES = -include:'$(ETOPDIR)/include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
+ ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)/include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
ARCHUSRINCLUDES = -usrinc:'.'
endif