Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch/Toolchain.defs: replace all ${/$} with $(/$)

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an
2022-04-15 15:05:16 +08:00
committed by Xiang Xiao
parent aed21ba0bc
commit c08d9047b2
16 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/arm/Toolchain.defs
+3 -3
View File
@@ -118,12 +118,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/arm/src/armv6-m/Toolchain.defs
+3 -3
View File
@@ -110,12 +110,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/arm/src/armv7-a/Toolchain.defs
+3 -3
View File
@@ -165,12 +165,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/arm/src/armv7-r/Toolchain.defs
+3 -3
View File
@@ -141,12 +141,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/avr/src/avr/Toolchain.defs
+3 -3
View File
@@ -126,12 +126,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/avr/src/avr32/Toolchain.defs
+3 -3
View File
@@ -50,12 +50,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/mips/src/mips32/Toolchain.defs
+3 -3
View File
@@ -279,12 +279,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/misoc/src/lm32/Toolchain.defs
+3 -3
View File
@@ -87,12 +87,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/misoc/src/minerva/Toolchain.defs
+3 -3
View File
@@ -41,12 +41,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/or1k/src/mor1kx/Toolchain.defs
+3 -3
View File
@@ -68,12 +68,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/risc-v/src/common/Toolchain.defs
+3 -3
View File
@@ -144,12 +144,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/xtensa/src/lx6/Toolchain.defs
+3 -3
View File
@@ -94,12 +94,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/xtensa/src/lx7/Toolchain.defs
+3 -3
View File
@@ -94,12 +94,12 @@ OBJDUMP = $(CROSSDEV)objdump
# Add the builtin library # Add the builtin library
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-libgcc-file-name))
ifneq ($(CONFIG_LIBM),y) ifneq ($(CONFIG_LIBM),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libm.a))
endif endif
ifeq ($(CONFIG_LIBSUPCXX),y) ifeq ($(CONFIG_LIBSUPCXX),y)
EXTRA_LIBS += ${wildcard ${shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a}} EXTRA_LIBS += $(wildcard $(shell $(CC) $(ARCHCPUFLAGS) --print-file-name=libsupc++.a))
endif endif
arch/z16/src/z16f/Toolchain.defs
+10 -10
View File
@@ -43,7 +43,7 @@ endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSINSTALLDIR = $(INSTALLROOT)/ZDSII_ZNEO_$(ZDSVERSION) ZDSINSTALLDIR = $(INSTALLROOT)/ZDSII_ZNEO_$(ZDSVERSION)
INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"} INSTALLDIR = $(shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g")
ZDSBINDIR = $(INSTALLDIR)\bin ZDSBINDIR = $(INSTALLDIR)\bin
ZDSSTDINCDIR = $(INSTALLDIR)\include\std ZDSSTDINCDIR = $(INSTALLDIR)\include\std
ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog
@@ -51,7 +51,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
else else
ZDSINSTALLDIR = $(INSTALLROOT)/ZDSII_ZNEO_$(ZDSVERSION) ZDSINSTALLDIR = $(INSTALLROOT)/ZDSII_ZNEO_$(ZDSVERSION)
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} INSTALLDIR = $(shell cygpath -u "$(ZDSINSTALLDIR)")
ZDSBINDIR = $(INSTALLDIR)/bin ZDSBINDIR = $(INSTALLDIR)/bin
ZDSSTDINCDIR = $(INSTALLDIR)/include/std ZDSSTDINCDIR = $(INSTALLDIR)/include/std
ZDSZILOGINCDIR = $(INSTALLDIR)/include/zilog ZDSZILOGINCDIR = $(INSTALLDIR)/include/zilog
@@ -61,17 +61,17 @@ else
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WTOPDIR = ${shell cygpath -w "$(TOPDIR)"} WTOPDIR = $(shell cygpath -w "$(TOPDIR)")
WZDSSTDINCDIR = ${shell cygpath -w "$(ZDSSTDINCDIR)"} WZDSSTDINCDIR = $(shell cygpath -w "$(ZDSSTDINCDIR)")
WZDSZILOGINCDIR = ${shell cygpath -w "$(ZDSZILOGINCDIR)"} WZDSZILOGINCDIR = $(shell cygpath -w "$(ZDSZILOGINCDIR)")
WZDSSTDLIBDIR = ${shell cygpath -w "$(ZDSSTDLIBDIR)"} WZDSSTDLIBDIR = $(shell cygpath -w "$(ZDSSTDLIBDIR)")
WZDSZILOGLIBDIR = ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} WZDSZILOGLIBDIR = $(shell cygpath -w "$(ZDSZILOGLIBDIR)")
# Escaped versions # Escaped versions
ETOPDIR = ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"} ETOPDIR = $(shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g")
EZDSSTDINCDIR = ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"} EZDSSTDINCDIR = $(shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g")
EZDSZILOGINCDIR = ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"} EZDSZILOGINCDIR = $(shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g")
endif endif
# CPU Identification # CPU Identification
arch/z80/src/ez80/Toolchain.defs
+10 -10
View File
@@ -114,14 +114,14 @@ endif
ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION) ZDSINSTALLDIR := $(INSTALLROOT)/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"} INSTALLDIR = $(shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g")
ZDSBINDIR := $(INSTALLDIR)\bin ZDSBINDIR := $(INSTALLDIR)\bin
ZDSSTDINCDIR := $(INSTALLDIR)\include\std ZDSSTDINCDIR := $(INSTALLDIR)\include\std
ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
else else
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} INSTALLDIR = $(shell cygpath -u "$(ZDSINSTALLDIR)")
ZDSBINDIR := $(INSTALLDIR)/bin ZDSBINDIR := $(INSTALLDIR)/bin
ZDSSTDINCDIR := $(INSTALLDIR)/include/std ZDSSTDINCDIR := $(INSTALLDIR)/include/std
ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
@@ -131,17 +131,17 @@ else
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} WTOPDIR := $(shell cygpath -w "$(TOPDIR)")
WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} WZDSSTDINCDIR := $(shell cygpath -w "$(ZDSSTDINCDIR)")
WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} WZDSZILOGINCDIR := $(shell cygpath -w "$(ZDSZILOGINCDIR)")
WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} WZDSSTDLIBDIR := $(shell cygpath -w "$(ZDSSTDLIBDIR)")
WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} WZDSZILOGLIBDIR := $(shell cygpath -w "$(ZDSZILOGLIBDIR)")
# Escaped versions # Escaped versions
ETOPDIR := ${shell echo $(WTOPDIR) | sed -e "s/ /%20/g"} ETOPDIR := $(shell echo $(WTOPDIR) | sed -e "s/ /%20/g")
EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"} EZDSSTDINCDIR := $(shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g")
EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"} EZDSZILOGINCDIR := $(shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g")
endif endif
# Optimization level # Optimization level
arch/z80/src/z8/Toolchain.defs
+11 -11
View File
@@ -35,7 +35,7 @@ endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION) ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"} INSTALLDIR = $(shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g")
ZDSBINDIR = $(INSTALLDIR)\bin ZDSBINDIR = $(INSTALLDIR)\bin
ZDSSTDINCDIR = $(INSTALLDIR)\include\std ZDSSTDINCDIR = $(INSTALLDIR)\include\std
ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog
@@ -49,7 +49,7 @@ endif
ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
else else
ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION) ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_Z8Encore!_$(ZDSVERSION)
INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} INSTALLDIR = $(shell cygpath -u "$(ZDSINSTALLDIR)")
ZDSBINDIR = $(INSTALLDIR)/bin ZDSBINDIR = $(INSTALLDIR)/bin
ZDSSTDINCDIR = $(INSTALLDIR)/include/std ZDSSTDINCDIR = $(INSTALLDIR)/include/std
ZDSZILOGINCDIR = $(INSTALLDIR)/include/zilog ZDSZILOGINCDIR = $(INSTALLDIR)/include/zilog
@@ -65,18 +65,18 @@ endif
# These are the same directories but with the directory separator # These are the same directories but with the directory separator
# character swapped as needed by the ZDS-II compiler # character swapped as needed by the ZDS-II compiler
WTOPDIR = ${shell cygpath -w "$(TOPDIR)"} WTOPDIR = $(shell cygpath -w "$(TOPDIR)")
WZDSSTDINCDIR = ${shell cygpath -w "$(ZDSSTDINCDIR)"} WZDSSTDINCDIR = $(shell cygpath -w "$(ZDSSTDINCDIR)")
WZDSZILOGINCDIR = ${shell cygpath -w "$(ZDSZILOGINCDIR)"} WZDSZILOGINCDIR = $(shell cygpath -w "$(ZDSZILOGINCDIR)")
WZDSDEVINCDIR = ${shell cygpath -w "$(ZDSDEVINCDIR)"} WZDSDEVINCDIR = $(shell cygpath -w "$(ZDSDEVINCDIR)")
WZDSSTDLIBDIR = ${shell cygpath -w "$(ZDSSTDLIBDIR)"} WZDSSTDLIBDIR = $(shell cygpath -w "$(ZDSSTDLIBDIR)")
WZDSZILOGLIBDIR = ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} WZDSZILOGLIBDIR = $(shell cygpath -w "$(ZDSZILOGLIBDIR)")
# Escaped versions # Escaped versions
ETOPDIR = ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"} ETOPDIR = $(shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g")
EZDSSTDINCDIR = ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"} EZDSSTDINCDIR = $(shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g")
EZDSZILOGINCDIR = ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"} EZDSZILOGINCDIR = $(shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g")
endif endif
# CPU Identification # CPU Identification