diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-12 15:22:27 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-12 15:22:27 +0000 |
| commit | 333b9449c02c242229449e8a35023d740f2e93f7 (patch) | |
| tree | 9604398fcf5bb52a4d12b0e6b1d8b377880227f2 /apps/nshlib | |
| parent | dd91ab3f35500a0a13a7dced870ea5c6f9ad3765 (diff) | |
| download | px4-nuttx-333b9449c02c242229449e8a35023d740f2e93f7.tar.gz px4-nuttx-333b9449c02c242229449e8a35023d740f2e93f7.tar.bz2 px4-nuttx-333b9449c02c242229449e8a35023d740f2e93f7.zip | |
Changes to get a clean ez80 build using the ZDS 5.1.1 toolchain
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5341 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/nshlib')
| -rw-r--r-- | apps/nshlib/Makefile | 8 | ||||
| -rw-r--r-- | apps/nshlib/nsh_dbgcmds.c | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/apps/nshlib/Makefile b/apps/nshlib/Makefile index a16644c03..313a1f6cb 100644 --- a/apps/nshlib/Makefile +++ b/apps/nshlib/Makefile @@ -89,10 +89,14 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + BIN = ..\libapps$(LIBEXT) +else ifeq ($(WINTOOL),y) - BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" + BIN = ..\\libapps$(LIBEXT) else - BIN = "$(APPDIR)/libapps$(LIBEXT)" + BIN = ../libapps$(LIBEXT) +endif endif ROOTDEPPATH = --dep-path . diff --git a/apps/nshlib/nsh_dbgcmds.c b/apps/nshlib/nsh_dbgcmds.c index 627c56bcd..5463e0f5a 100644 --- a/apps/nshlib/nsh_dbgcmds.c +++ b/apps/nshlib/nsh_dbgcmds.c @@ -367,9 +367,10 @@ int cmd_xd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) int cmd_hexdump(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { uint8_t buffer[IOBUFFERSIZE]; + char msg[32]; + int position; int fd; int ret = OK; - char msg[32]; /* Open the file for reading */ @@ -380,7 +381,7 @@ int cmd_hexdump(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) return ERROR; } - int position = 0; + position = 0; for (;;) { int nbytesread = read(fd, buffer, IOBUFFERSIZE); |