From 487e6197c84a8d8829cd8bfcee8eb4b942725ea2 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 9 Nov 2016 13:40:46 -0600 Subject: [PATCH] Don't include from Nuttx/include as system files. Need real platform files. config.h is an issue. --- graphics/traveler/tools/libwld/Makefile | 7 +++++-- graphics/traveler/tools/tcledit/Imakefile | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/graphics/traveler/tools/libwld/Makefile b/graphics/traveler/tools/libwld/Makefile index 23dfa60c4..7a03ae687 100644 --- a/graphics/traveler/tools/libwld/Makefile +++ b/graphics/traveler/tools/libwld/Makefile @@ -33,7 +33,10 @@ # ############################################################################# -TRAVELER = $(APPDIR)/graphics/traveler + +WD = ${shell pwd} +APPDIR = $(WD)/../../.. +TRAVELER = $(WD)/../.. BIN = libwld.a WLDSRCS = wld_createworld.c wld_deallocateworld.c @@ -56,7 +59,7 @@ AR = ar -rcv DEBUG_LEVEL = 0 DEFINES = -DDEBUG_LEVEL=$(DEBUG_LEVEL) -INCLUDES = -I. -I$(APPDIR)/include -I$(TOPDIR)/include -I$(TRAVELER)/include +INCLUDES = -I. -I$(APPDIR)/include -I$(TRAVELER)/include WARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wno-trigraphs ifneq ($(DEBUG_LEVEL),0) diff --git a/graphics/traveler/tools/tcledit/Imakefile b/graphics/traveler/tools/tcledit/Imakefile index 804569ea2..9ab436c46 100644 --- a/graphics/traveler/tools/tcledit/Imakefile +++ b/graphics/traveler/tools/tcledit/Imakefile @@ -68,9 +68,7 @@ endif TOOLS = $(TRAVELER)/tools LIBWLD = $(TOOLS)/libwld - TOPDIR = /home/patacongo/projects/nuttx/master/nuttx - NUTTXINC = $(TOPDIR)/include - INC_PATH = -I$(TRAVELER)/include -I$(TOOLS)/tcledit -I$(LIBWLD) -isystem $(NUTTXINC) + INC_PATH = -I$(TRAVELER)/include -I$(TOOLS)/tcledit -I$(LIBWLD) VPATH = $(TOOLS)/tcledit