sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Traveler: Make updated to build available tools

Browse Source
This commit is contained in:
Gregory Nutt 2014-12-15 08:25:43 -06:00
parent ed7cca7d16
commit b37d614ad0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
graphics/traveler/Makefile
View File

@ -39,10 +39,11 @@ include $(APPDIR)/Make.defs
# Directories
TRAVELER_DIR = $(APPDIR)/graphics/traveler
TRAVELER_SRC = $(TRAVELER_DIR)/src
TRAVELER_INC = $(TRAVELER_DIR)/include
TRAVELER_DEMO = $(TRAVELER_DIR)/world
TRAVELER_DIR = $(APPDIR)/graphics/traveler
TRAVELER_SRC = $(TRAVELER_DIR)/src
TRAVELER_INC = $(TRAVELER_DIR)/include
TRAVELER_DEMO = $(TRAVELER_DIR)/world
TRAVELER_TOOLS = $(TRAVELER_DIR)/tools
# Traveler built-in application info
@ -119,8 +120,8 @@ VPATH = .:src
# Common build
all: .built
.PHONY: clean depend distclean
all: .built tools
.PHONY: tools clean depend distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -140,6 +141,9 @@ endif
$(call ARCHIVE, $(BIN), $(OBJS))
@touch .built
tools:
$(Q) $(MAKE) -C $(TRAVELER_TOOLS) -f Makefile.host TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
ifeq ($(CONFIG_BUILD_KERNEL),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"

3
graphics/traveler/tools/Makefile.host
View File

@ -114,7 +114,7 @@ endif
# mktrig - Regenerate trigonometry look-up tables
mktrig$(HOSTEXEEXT): $(MKTRIG_OBJS)
$(Q) $(HOSTCC) $(HOSTCFLAGS) $< -o $@
$(Q) $(HOSTCC) $(HOSTCFLAGS) -lm $< -o $@
ifdef HOSTEXEEXT
mktrig: mktrig$(HOSTEXEEXT)
@ -124,6 +124,7 @@ clean:
$(call DELFILE, pll2txt$(HOSTEXEEXT))
$(call DELFILE, txt2pll$(HOSTEXEEXT))
$(call DELFILE, mktrig$(HOSTEXEEXT))
$(call DELFILE, trigtbl.tmp)
ifneq ($(CONFIG_WINDOWS_NATIVE),y)
$(Q) rm -rf *.dSYM
endif