mirror of
https://github.com/apache/nuttx-apps.git
synced 2025-10-19 11:23:07 +08:00
Several fixes for errors introduced by last check-ins
This commit is contained in:
@@ -13,6 +13,14 @@ config EXAMPLES_NSH
|
||||
|
||||
if EXAMPLES_NSH
|
||||
|
||||
config EXAMPLES_NSH_PROGNAME
|
||||
string "Program name"
|
||||
default "nsh"
|
||||
depends on BUILD_KERNEL
|
||||
---help---
|
||||
This is the name of the program that will be use when the NSH ELF
|
||||
program is installed.
|
||||
|
||||
config EXAMPLES_NSH_CXXINITIALIZE
|
||||
bool "C++ Initialization"
|
||||
default n
|
||||
|
@@ -39,30 +39,33 @@ include $(APPDIR)/Make.defs
|
||||
|
||||
# NuttShell (NSH) Example
|
||||
|
||||
ASRCS =
|
||||
CSRCS = nsh_main.c
|
||||
ASRCS =
|
||||
CSRCS = nsh_main.c
|
||||
|
||||
AOBJS = $(ASRCS:.S=$(OBJEXT))
|
||||
COBJS = $(CSRCS:.c=$(OBJEXT))
|
||||
AOBJS = $(ASRCS:.S=$(OBJEXT))
|
||||
COBJS = $(CSRCS:.c=$(OBJEXT))
|
||||
|
||||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
BIN = ..\..\libapps$(LIBEXT)
|
||||
BIN = ..\..\libapps$(LIBEXT)
|
||||
else
|
||||
ifeq ($(WINTOOL),y)
|
||||
BIN = ..\\..\\libapps$(LIBEXT)
|
||||
BIN = ..\\..\\libapps$(LIBEXT)
|
||||
else
|
||||
BIN = ../../libapps$(LIBEXT)
|
||||
BIN = ../../libapps$(LIBEXT)
|
||||
endif
|
||||
endif
|
||||
|
||||
ROOTDEPPATH = --dep-path .
|
||||
CONFIG_NSH_PROGNAME ?= nsh$(EXEEXT)
|
||||
PROGNAME = $(CONFIG_NSH_PROGNAME)
|
||||
|
||||
ROOTDEPPATH = --dep-path .
|
||||
|
||||
# Common build
|
||||
|
||||
VPATH =
|
||||
VPATH =
|
||||
|
||||
all: .built
|
||||
.PHONY: clean depend distclean
|
||||
|
Reference in New Issue
Block a user