summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-30 16:52:56 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-30 16:52:56 +0000
commiteff4606e227da40f6aaaa1dfa008ed126a55f9b5 (patch)
treeac26f6e33ea5e2037850b8a2cb071024102052a9
parent73e37856afedca2090dd25820b9e484381aff6eb (diff)
downloadnuttx-eff4606e227da40f6aaaa1dfa008ed126a55f9b5.tar.gz
nuttx-eff4606e227da40f6aaaa1dfa008ed126a55f9b5.tar.bz2
nuttx-eff4606e227da40f6aaaa1dfa008ed126a55f9b5.zip
Fix error in NxWM makefile that creapt in with recent check-ins
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4787 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--NxWidgets/ChangeLog.txt3
-rw-r--r--NxWidgets/nxwm/Makefile2
-rw-r--r--nuttx/configs/stm3220g-eval/README.txt41
-rwxr-xr-xnuttx/configs/stm3240g-eval/README.txt41
4 files changed, 84 insertions, 3 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt
index ad617f4b7..b017b2033 100644
--- a/NxWidgets/ChangeLog.txt
+++ b/NxWidgets/ChangeLog.txt
@@ -155,3 +155,6 @@
* NxWM: Increase default spacing of icons on the Start Window.
* NxWM::CHexCalculator: Fix some non-standard calculator behavior
after = is pressed. Use upper case hex. Increase font size.
+* nxwm/Makefile: Fix error that creapt in during some other
+ recent check-ins.
+
diff --git a/NxWidgets/nxwm/Makefile b/NxWidgets/nxwm/Makefile
index 4d4ecb4d2..e50863494 100644
--- a/NxWidgets/nxwm/Makefile
+++ b/NxWidgets/nxwm/Makefile
@@ -57,7 +57,7 @@ endif
# Applications
-CXXSRCS = cstartwindow.cxx cnxconsole.cxx chexcalculator.cxx
+CXXSRCS += cstartwindow.cxx cnxconsole.cxx chexcalculator.cxx
ifeq ($(CONFIG_NXWM_TOUCHSCREEN),y)
CXXSRCS += ccalibration.cxx
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index 2b5211708..bc85f7ff0 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -926,7 +926,46 @@ Where <subdir> is one of the following:
Documentation for installing the NxWM unit test can be found here:
- trunk/NxWidgets/UnitTests/READEM.txt
+ trunk/NxWidgets/UnitTests/README.txt
+
+ Here is the quick summary of the build steps:
+
+ 1. Intall the nxwm configuration
+
+ $ cd ~/nuttx/trunk/nuttx/tools
+ $ ./configure.sh stm3220g-eval/nxwm
+
+ 2. Make the build context (only)
+
+ $ cd ..
+ $ . ./setenv.sh
+ $ make context
+ ...
+
+ 3. Install the nxwm unit test
+
+ $ cd ~/nuttx/trunk/NxWidgets
+ $ tools/install.sh ~/nuttx/trunk/apps nxwm
+ Creating symbolic link
+ - To ~/nuttx/trunk/NxWidgets/UnitTests/nxwm
+ - At ~/nuttx/trunk/apps/external
+
+ 4. Build the NxWidgets library
+
+ $ cd ~/nuttx/trunk/NxWidgets/libnxwidgets
+ $ make TOPDIR=~/nuttx/trunk/nuttx
+ ...
+
+ 5. Build the NxWM library
+
+ $ cd ~/nuttx/trunk/NxWidgets/nxwm
+ $ make TOPDIR=~//nuttx/trunk/nuttx
+ ...
+
+ 6. Built NuttX with the installed unit test as the application
+
+ $ cd ~/nuttx/trunk/nuttx
+ $ make
ostest:
------
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index acf94fadc..d64a5d1c8 100755
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -1127,7 +1127,46 @@ Where <subdir> is one of the following:
Documentation for installing the NxWM unit test can be found here:
- trunk/NxWidgets/UnitTests/READEM.txt
+ trunk/NxWidgets/UnitTests/README.txt
+
+ Here is the quick summary of the build steps:
+
+ 1. Intall the nxwm configuration
+
+ $ cd ~/nuttx/trunk/nuttx/tools
+ $ ./configure.sh stm3240g-eval/nxwm
+
+ 2. Make the build context (only)
+
+ $ cd ..
+ $ . ./setenv.sh
+ $ make context
+ ...
+
+ 3. Install the nxwm unit test
+
+ $ cd ~/nuttx/trunk/NxWidgets
+ $ tools/install.sh ~/nuttx/trunk/apps nxwm
+ Creating symbolic link
+ - To ~/nuttx/trunk/NxWidgets/UnitTests/nxwm
+ - At ~/nuttx/trunk/apps/external
+
+ 4. Build the NxWidgets library
+
+ $ cd ~/nuttx/trunk/NxWidgets/libnxwidgets
+ $ make TOPDIR=~/nuttx/trunk/nuttx
+ ...
+
+ 5. Build the NxWM library
+
+ $ cd ~/nuttx/trunk/NxWidgets/nxwm
+ $ make TOPDIR=~//nuttx/trunk/nuttx
+ ...
+
+ 6. Built NuttX with the installed unit test as the application
+
+ $ cd ~/nuttx/trunk/nuttx
+ $ make
ostest:
------