summaryrefslogtreecommitdiff
path: root/NxWidgets/UnitTests/CKeypad
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-22 22:41:11 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-03-22 22:41:11 +0000
commitef0b23ea7dba56647ceffa0b561d971f7f963540 (patch)
treeaa2fdfc42b8d3994288a6dc854163e993ac5b1bf /NxWidgets/UnitTests/CKeypad
parent4dedf494c242b2c4b52707441eefe2a36fbacf0f (diff)
downloadnuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.tar.gz
nuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.tar.bz2
nuttx-ef0b23ea7dba56647ceffa0b561d971f7f963540.zip
Prep for NxWidgets 1.0 release
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4506 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/UnitTests/CKeypad')
-rw-r--r--NxWidgets/UnitTests/CKeypad/Makefile4
-rw-r--r--NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/NxWidgets/UnitTests/CKeypad/Makefile b/NxWidgets/UnitTests/CKeypad/Makefile
index 631be3b68..ddb8fb962 100644
--- a/NxWidgets/UnitTests/CKeypad/Makefile
+++ b/NxWidgets/UnitTests/CKeypad/Makefile
@@ -41,7 +41,7 @@ include $(APPDIR)/Make.defs
# Add the path to the NXWidget include directory to the CFLAGS
-NXWIDGETS_DIR="$(TESTDIR)/../../NXWidgets/libnxwidgets"
+NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
@@ -56,7 +56,7 @@ endif
# Get the path to the archiver tool
-TESTTOOL_DIR="$(TESTDIR)/../tools"
+TESTTOOL_DIR="$(TESTDIR)/../../tools"
ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
# Hello, World! C++ Example
diff --git a/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx b/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx
index 820113960..c1c7ba79e 100644
--- a/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx
+++ b/NxWidgets/UnitTests/CKeypad/ckeypadtest.hxx
@@ -69,7 +69,7 @@
#endif
#ifndef CONFIG_CKEYPADTEST_BGCOLOR
-# define CONFIG_CKEYPADTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKCOLOR
+# define CONFIG_CKEYPADTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif
// What is the entry point called?