summaryrefslogtreecommitdiff
path: root/nuttx/arch/z80/src
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-12-03 20:12:59 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-12-03 20:12:59 +0000
commitb052b3b6508e6a9a51017072c541fa0eb8467fdb (patch)
tree17f5df6ecd839ddf1ef41cffc724c6161486e06b /nuttx/arch/z80/src
parent73705c2998717a35ad81c099340caa518eaed785 (diff)
downloadpx4-nuttx-b052b3b6508e6a9a51017072c541fa0eb8467fdb.tar.gz
px4-nuttx-b052b3b6508e6a9a51017072c541fa0eb8467fdb.tar.bz2
px4-nuttx-b052b3b6508e6a9a51017072c541fa0eb8467fdb.zip
Progress toward a z80 native Windows build -- still needs some work
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5411 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/z80/src')
-rw-r--r--nuttx/arch/z80/src/Makefile.sdcc14
-rw-r--r--nuttx/arch/z80/src/z80/Kconfig1
2 files changed, 8 insertions, 7 deletions
diff --git a/nuttx/arch/z80/src/Makefile.sdcc b/nuttx/arch/z80/src/Makefile.sdcc
index a8a63c111..91f99d0cf 100644
--- a/nuttx/arch/z80/src/Makefile.sdcc
+++ b/nuttx/arch/z80/src/Makefile.sdcc
@@ -96,12 +96,12 @@ $(COBJS): %$(OBJEXT): %.c
# This is a kludge to work around some conflicting symbols in libsdcc.lib
-$(SDCCLIBDIR)/myz80.lib: $(SDCCLIBDIR)/$(SDCCLIB)
- $(Q) cat $(SDCCLIBDIR)/$(SDCCLIB) | \
+$(SDCC_LIBDIR)/myz80.lib: $(SDCC_LIBDIR)/$(SDCCLIB)
+ $(Q) cat $(SDCC_LIBDIR)/$(SDCCLIB) | \
grep -v alloc | grep -v free | grep -v printf | \
grep -v _str | grep -v _mem | grep -v crt0\.o \
> myz80.lib
- $(Q) mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib
+ $(Q) mv -f myz80.lib $(SDCC_LIBDIR)/myz80.lib
# Create a header file that contains addressing information needed by the code
@@ -143,11 +143,11 @@ board/libboard$(LIBEXT):
# This target builds the final executable
-pass1.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT)
+pass1.hex: up_mem.h asm_mem.h $(SDCC_LIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: pass1.hex"
@echo "--" >pass1.lnk # Non-interactive
@echo "-k $(BOARDDIR)" >>pass1.lnk # Path to board library
- @echo "-k $(SDCCLIBDIR)" >>pass1.lnk # Path to SDCC z80 library
+ @echo "-k $(SDCC_LIBDIR)" >>pass1.lnk # Path to SDCC z80 library
@echo "-l libboard$(LIBEXT)" >>pass1.lnk # Name of board library
$(Q) for LIB in $(LINKLIBS); do \
echo "-l $(TOPDIR)/lib/$$LIB" >> pass1.lnk ;\
@@ -176,11 +176,11 @@ endif
$(Q) $(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT)
$(Q) $(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ)
-nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT)
+nuttx.hex: up_mem.h asm_mem.h $(SDCC_LIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx.hex"
@echo "--" >nuttx.lnk # Non-interactive
@echo "-k $(BOARDDIR)" >>nuttx.lnk # Path to board library
- @echo "-k $(SDCCLIBDIR)" >>nuttx.lnk # Path to SDCC z80 library
+ @echo "-k $(SDCC_LIBDIR)" >>nuttx.lnk # Path to SDCC z80 library
@echo "-l libboard$(LIBEXT)" >>nuttx.lnk # Name of board library
$(Q) for LIB in $(LINKLIBS); do \
echo "-l $(TOPDIR)/lib/$$LIB" >> nuttx.lnk ;\
diff --git a/nuttx/arch/z80/src/z80/Kconfig b/nuttx/arch/z80/src/z80/Kconfig
index 99c12ae06..233b6ec90 100644
--- a/nuttx/arch/z80/src/z80/Kconfig
+++ b/nuttx/arch/z80/src/z80/Kconfig
@@ -12,6 +12,7 @@ choice
config Z80_TOOLCHAIN_SDCCL
bool "SDCC for Linux, MAC OSX, or Cygwin"
+ depends on !WINDOWS_NATIVE
config Z80_TOOLCHAIN_SDCCW
bool "SDCC for Windows"