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

Merged in raiden00/apps (pull request #200)

Browse Source 
Some improvements to netutils/cjson and testing/unity

* netutils/cjson/Makefile: fix the error when creating Make.dep

* testing/unity/Makefile: fix the error when creating Make.dep

* include/.gitignore: ignore cJSON headers

* netutils/cjson/Kconfig: update default version to 1.7.12. Previous releases raise compilation warnings about redefined true/false

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
raiden00pl 2019-10-06 11:55:23 +00:00 committed by Gregory Nutt
parent e829f047bc
commit ab7c5a7d4e
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/.gitignore vendored
View File

@ -1,2 +1,4 @@
/pcode /pcode
/netutils/cJSON.h
/netutils/cJSON_Utils.h

2
netutils/cjson/Kconfig
View File

@ -18,6 +18,6 @@ config NETUTILS_CJSON_URL
config NETUTILS_CJSON_VERSION config NETUTILS_CJSON_VERSION
string "Version number" string "Version number"
default "1.7.11" default "1.7.12"
endif endif

2
netutils/cjson/Makefile
View File

@ -52,7 +52,7 @@ CJSON_UNPACKNAME = cJSON-$(CJSON_VERSION)
UNPACK ?= tar -zxf UNPACK ?= tar -zxf
CJSON_UNPACKDIR = $(WD)/$(CJSON_UNPACKNAME) CJSON_UNPACKDIR = $(WD)/$(CJSON_UNPACKNAME)
CJSON_SRCDIR = $(CJSON_UNPACKDIR) CJSON_SRCDIR = $(CJSON_UNPACKNAME)
APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)netutils APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)netutils

2
testing/unity/Makefile
View File

@ -52,7 +52,7 @@ UNITY_UNPACKNAME = Unity-$(UNITY_VERSION)
UNPACK ?= tar -zxf UNPACK ?= tar -zxf
UNITY_UNPACKDIR = $(WD)/$(UNITY_UNPACKNAME) UNITY_UNPACKDIR = $(WD)/$(UNITY_UNPACKNAME)
UNITY_SRCDIR = $(UNITY_UNPACKDIR)$(DELIM)src UNITY_SRCDIR = $(UNITY_UNPACKNAME)$(DELIM)src
APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)testing APPS_INCDIR = $(APPDIR)$(DELIM)include$(DELIM)testing