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

Makefiles: Change ${shell pwd} to $(CURDIR) since pwd doesn't exist on Windows

Browse Source
This commit is contained in:
Xiang Xiao 2019-10-02 07:06:50 -06:00 committed by Gregory Nutt
parent f7229b24fe
commit e73ca15c99
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -35,12 +35,7 @@
# #
############################################################################ ############################################################################
ifeq ($(CONFIG_WINDOWS_NATIVE),y) APPDIR = $(CURDIR)
APPDIR = ${shell echo %CD%}
else
APPDIR = ${shell pwd}
endif
TOPDIR ?= $(APPDIR)/import TOPDIR ?= $(APPDIR)/import
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs -include $(APPDIR)/Make.defs

2
graphics/littlevgl/Makefile
View File

@ -55,7 +55,7 @@ LVGL_DIR = .
# Set up build configuration and environment # Set up build configuration and environment
WD := ${shell pwd | sed -e 's/ /\\ /g'} WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
CONFIG_GRAPH_LVGL_URL ?= "https://littlevgl.com/download/" CONFIG_GRAPH_LVGL_URL ?= "https://littlevgl.com/download/"

2
graphics/traveler/tools/libwld/Makefile
View File

@ -34,7 +34,7 @@
############################################################################# #############################################################################
WD = ${shell pwd} WD = $(CURDIR)
TRAVELER = $(WD)/../.. TRAVELER = $(WD)/../..
NUTTXDIR = $(WD)/../include NUTTXDIR = $(WD)/../include

2
interpreters/ficl/Makefile
View File

@ -33,7 +33,7 @@
# #
############################################################################ ############################################################################
BUILDDIR := ${shell pwd | sed -e 's/ /\\ /g'} BUILDDIR := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs

2
netutils/cjson/Makefile
View File

@ -39,7 +39,7 @@
# Set up build configuration and environment # Set up build configuration and environment
WD := ${shell pwd | sed -e 's/ /\\ /g'} WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
CONFIG_NETUTILS_CJSON_URL ?= "https://github.com/DaveGamble/cJSON/archive" CONFIG_NETUTILS_CJSON_URL ?= "https://github.com/DaveGamble/cJSON/archive"
CONFIG_NETUTILS_CJSON_VERSION ?= "1.7.10" CONFIG_NETUTILS_CJSON_VERSION ?= "1.7.10"

2
testing/unity/Makefile
View File

@ -39,7 +39,7 @@
# Set up build configuration and environment # Set up build configuration and environment
WD := ${shell pwd | sed -e 's/ /\\ /g'} WD := ${shell echo $(CURDIR) | sed -e 's/ /\\ /g'}
CONFIG_TESTING_UNITY_URL ?= "https://github.com/ThrowTheSwitch/Unity/archive" CONFIG_TESTING_UNITY_URL ?= "https://github.com/ThrowTheSwitch/Unity/archive"
CONFIG_TESTING_UNITY_VERSION ?= "2.4.3" CONFIG_TESTING_UNITY_VERSION ?= "2.4.3"