From 45f021f2a88d9f76c7802aa31d3fc67827ff288d Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 29 Apr 2012 22:10:52 +0000
Subject: NxWM update

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4676 42af7a65-404d-4744-a932-0658087f49c3
---
 NxWidgets/libnxwidgets/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'NxWidgets/libnxwidgets/Makefile')

diff --git a/NxWidgets/libnxwidgets/Makefile b/NxWidgets/libnxwidgets/Makefile
index e3ff57339..9a52087ed 100644
--- a/NxWidgets/libnxwidgets/Makefile
+++ b/NxWidgets/libnxwidgets/Makefile
@@ -36,8 +36,7 @@
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
-NXWDIR := ${shell pwd | sed -e 's/ /\\ /g'}
-
+NXWIDGETDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 ASRCS =
 CSRCS =
@@ -76,8 +75,12 @@ OBJS = $(AOBJS) $(COBJS) $(CXXOBJS)
 
 BIN = libnxwidgets$(LIBEXT)
 
-CFLAGS += -I include
-CXXFLAGS += -I include
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
+CXXFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
 DEPPATH = --dep-path src
 VPATH = src
 
@@ -97,7 +100,7 @@ check_nuttx:
 	@( \
 		if [ -z "$(TOPDIR)" ]; then \
 			echo "The path to the nuttx directory must be provided on the command line."; \
-			echo "Usage: make -C $(NXWDIR) TOPDIR=\"<nuttx directory>\""; \
+			echo "Usage: make -C $(NXWIDGETDIR) TOPDIR=\"<nuttx directory>\""; \
 			exit 1; \
 		fi; \
 		if [ ! -d "$(TOPDIR)" ]; then \
-- 
cgit v1.2.3