aboutsummaryrefslogtreecommitdiff
path: root/nuttx/tools
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-26 14:36:28 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-26 14:36:28 +0000
commit923da1b34bd4b7fff1619735d80d343c9d4a204d (patch)
treefc7b9a9e3bcccfa11b7611218c9bbfb4a96f6900 /nuttx/tools
parent415e8303727189dff9e702edf61b22be027b292a (diff)
downloadpx4-firmware-923da1b34bd4b7fff1619735d80d343c9d4a204d.tar.gz
px4-firmware-923da1b34bd4b7fff1619735d80d343c9d4a204d.tar.bz2
px4-firmware-923da1b34bd4b7fff1619735d80d343c9d4a204d.zip
Fixes for clean compilation of NxWidgets/NxWM with Kconfig and changes to build system; Fixes to Shenzhou NxWM configuration for clean build
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5193 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/tools')
-rw-r--r--nuttx/tools/cfgparser.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/nuttx/tools/cfgparser.c b/nuttx/tools/cfgparser.c
index e49b29d5e..b1f189f6f 100644
--- a/nuttx/tools/cfgparser.c
+++ b/nuttx/tools/cfgparser.c
@@ -56,13 +56,24 @@ char line[LINESIZE+1];
****************************************************************************/
/* These are configuration variable name that are quoted by configuration tool
- * but which must be unquoated when used in C code.
+ * but which must be unquoted when used in C code.
*/
static const char *dequote_list[] =
{
- "CONFIG_USER_ENTRYPOINT",
- NULL
+ /* NuttX */
+
+ "CONFIG_USER_ENTRYPOINT", /* Name of entry point function */
+
+ /* NxWidgets/NxWM */
+
+ "CONFIG_NXWM_BACKGROUND_IMAGE", /* Name of bitmap image class */
+ "CONFIG_NXWM_STARTWINDOW_ICON", /* Name of bitmap image class */
+ "CONFIG_NXWM_NXCONSOLE_ICON", /* Name of bitmap image class */
+ "CONFIG_NXWM_CALIBRATION_ICON", /* Name of bitmap image class */
+ "CONFIG_NXWM_HEXCALCULATOR_ICON", /* Name of bitmap image class */
+
+ NULL /* Marks the end of the list */
};
/****************************************************************************
@@ -239,7 +250,7 @@ static char *dequote_value(const char *varname, char *varval)
/* Handle the case where nothing is left after dequoting */
- if (len < 0)
+ if (len <= 0)
{
dqval = NULL;
}