diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-05 14:37:39 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-05 14:37:39 +0000 |
commit | 18d1f3e8c8813f17f7b064dc9f96f805efb76cf3 (patch) | |
tree | c6cbe64279b48b3b9d15643a569cca1787b1ef6d | |
parent | 20f03203b8c699bc97b1ba4c0661a125ac4182e4 (diff) | |
download | nuttx-18d1f3e8c8813f17f7b064dc9f96f805efb76cf3.tar.gz nuttx-18d1f3e8c8813f17f7b064dc9f96f805efb76cf3.tar.bz2 nuttx-18d1f3e8c8813f17f7b064dc9f96f805efb76cf3.zip |
apps/ build now supports an 'external' directory
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4021 42af7a65-404d-4744-a932-0658087f49c3
-rwxr-xr-x | apps/ChangeLog.txt | 4 | ||||
-rw-r--r-- | apps/Makefile | 15 | ||||
-rw-r--r-- | nuttx/include/nuttx/nx/nx.h | 17 | ||||
-rw-r--r-- | nuttx/include/nuttx/nx/nxtk.h | 6 |
4 files changed, 31 insertions, 11 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 0a362e849..24b02557e 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -120,3 +120,7 @@ data received on USB serial is echoed on the local console. * apps/examples/touchscreen: Add a simple, generic test for any touschscreen driver. + * Makefile: The apps/ Makefile now checks for an apps/external directory + or symbolic link. If such a directory/link exists (and has a Makefile), + it will be added to the apps/ build. This allows external directories + to be included into the apps/ build by simply creating a symbolic link. diff --git a/apps/Makefile b/apps/Makefile index 1e80685e3..db75855ca 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -53,19 +53,28 @@ SUBDIRS = examples graphics interpreters namedapp nshlib netutils system vsn -include .config # INSTALLED_APPS is the list of currently available application directories. It -# is the same as CONFIGURED_APPS, but filtered to exclude any non-existent apps. -# namedapp is always in the list of applications to be built +# is the same as CONFIGURED_APPS, but filtered to exclude any non-existent +# application directory. namedapp is always in the list of applications to be +# built. INSTALLED_APPS = namedapp # Create the list of available applications (INSTALLED_APPS) define ADD_BUILTIN -INSTALLED_APPS += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi} +INSTALLED_APPS += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi} endef $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN)))) +# The external/ directory may also be added to the INSTALLED_APPS. But there +# is no external/ directory in the repository. Rather, this directory may be +# provided by the user (possibly as a symbolic link) to add libraries and +# applications to the standard build from the repository. + +INSTALLED_APPS += ${shell if [ -r external/Makefile ]; then echo "external"; fi} +SUBDIRS += ${shell if [ -r external/Makefile ]; then echo "external"; fi} + # The final build target BIN = libapps$(LIBEXT) diff --git a/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h index 1c705e5aa..3198baf7f 100644 --- a/nuttx/include/nuttx/nx/nx.h +++ b/nuttx/include/nuttx/nx/nx.h @@ -103,7 +103,8 @@ struct nx_callback_s * rect - The rectangle that needs to be re-drawn (in window relative * coordinates) * more - true: More re-draw requests will follow - * arg - User provided argument (see nx_openwindow, nx_constructwindow) + * arg - User provided argument (see nx_openwindow, nx_requestbkgd, + * nxtk_openwindow, or nxtk_opentoolbar) * * Returned Value: * None @@ -127,7 +128,8 @@ struct nx_callback_s * the overall display * bounds - The bounding rectangle that the describes the entire * display - * arg - User provided argument (see nx_openwindow, nx_constructwindow) + * arg - User provided argument (see nx_openwindow, nx_requestbkgd, + * nxtk_openwindow, or nxtk_opentoolbar) * * Returned Value: * None @@ -149,7 +151,8 @@ struct nx_callback_s * hwnd - Window handle * pos - The (x,y) position of the mouse * buttons - See NX_MOUSE_* definitions - * arg - User provided argument (see nx_openwindow, nx_constructwindow) + * arg - User provided argument (see nx_openwindow, nx_requestbkgd, + * nxtk_openwindow, or nxtk_opentoolbar) * * Returned Value: * None @@ -171,7 +174,8 @@ struct nx_callback_s * hwnd - Window handle * nch - The number of characters that are available in ch[] * ch - The array of characters - * arg - User provided argument (see nx_openwindow, nx_constructwindow) + * arg - User provided argument (see nx_openwindow, nx_requestbkgd, + * nxtk_openwindow, or nxtk_opentoolbar) * * Returned Value: * None @@ -458,7 +462,7 @@ EXTERN int nx_closewindow(NXWINDOW hwnd); * Input Parameters: * handle - The handle returned by nx_connect * cb - Callbacks to use for processing background window events - * arg - User provided argument (see nx_openwindow, nx_constructwindow) + * arg - User provided value that will be returned with NX callbacks. * * Return: * OK on success; ERROR on failure with errno set appropriately @@ -703,7 +707,8 @@ int nx_setbgcolor(NXHANDLE handle, * Input Parameters: * hwnd - The window within which the move is to be done * rect - Describes the rectangular region to move - * offset - The offset to move the region + * offset - The offset to move the region. The rectangular region will be + * moved so that the origin is translated by this amount. * * Return: * OK on success; ERROR on failure with errno set appropriately diff --git a/nuttx/include/nuttx/nx/nxtk.h b/nuttx/include/nuttx/nx/nxtk.h index 0e066359a..ae11d565e 100644 --- a/nuttx/include/nuttx/nx/nxtk.h +++ b/nuttx/include/nuttx/nx/nxtk.h @@ -320,7 +320,8 @@ EXTERN int nxtk_fillcirclewindow(NXWINDOW hfwnd, * This must have been previously created by nxtk_openwindow(). * rect - Describes the rectangular region relative to the client * sub-window to move - * offset - The offset to move the region + * offset - The offset to move the region. The rectangular region will be + * moved so that the origin is translated by this amount. * * Return: * OK on success; ERROR on failure with errno set appropriately @@ -516,7 +517,8 @@ EXTERN int nxtk_fillcircletoolbar(NXWINDOW hfwnd, * nxtk_openwindow(). * rect - Describes the rectangular region relative to the toolbar * sub-window to move - * offset - The offset to move the region + * offset - The offset to move the region. The rectangular region will be + * moved so that the origin is translated by this amount. * * Return: * OK on success; ERROR on failure with errno set appropriately |