diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-15 08:25:43 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-15 08:25:43 -0600 |
| commit | 698fba65113ac33982c9fb9b5d7f9399682ec21e (patch) | |
| tree | 28a7b74583cd48d61029303421cd9f5f18f0072d /apps | |
| parent | 6c54f26d9e481f3915c290615dcd0370212c46f4 (diff) | |
| download | nuttx-698fba65113ac33982c9fb9b5d7f9399682ec21e.tar.gz nuttx-698fba65113ac33982c9fb9b5d7f9399682ec21e.tar.bz2 nuttx-698fba65113ac33982c9fb9b5d7f9399682ec21e.zip | |
Traveler: Make updated to build available tools
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/graphics/traveler/Makefile | 16 | ||||
| -rw-r--r-- | apps/graphics/traveler/tools/Makefile.host | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/apps/graphics/traveler/Makefile b/apps/graphics/traveler/Makefile index 1f39d1af6..54454fa9f 100644 --- a/apps/graphics/traveler/Makefile +++ b/apps/graphics/traveler/Makefile @@ -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)" diff --git a/apps/graphics/traveler/tools/Makefile.host b/apps/graphics/traveler/tools/Makefile.host index 22da1da4c..816755b71 100644 --- a/apps/graphics/traveler/tools/Makefile.host +++ b/apps/graphics/traveler/tools/Makefile.host @@ -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 |