From 2de0a78202d0a7207eb8378a73f69bd7b01422da Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 16 Sep 2018 06:52:25 -0600 Subject: [PATCH] apps/graphics/NxWidgets: Hooking into build system. --- graphics/NxWidgets/Make.defs | 37 +++++++ .../NxWidgets/UnitTests/CButton/Make.defs | 2 +- .../UnitTests/CButtonArray/Make.defs | 2 +- .../NxWidgets/UnitTests/CCheckBox/Make.defs | 2 +- .../UnitTests/CGlyphButton/Make.defs | 2 +- .../CGlyphSliderHorizontal/Make.defs | 2 +- graphics/NxWidgets/UnitTests/CImage/Make.defs | 2 +- .../NxWidgets/UnitTests/CKeypad/Make.defs | 2 +- graphics/NxWidgets/UnitTests/CLabel/Make.defs | 2 +- .../UnitTests/CLatchButton/Make.defs | 2 +- .../UnitTests/CLatchButtonArray/Make.defs | 2 +- .../NxWidgets/UnitTests/CListBox/Make.defs | 2 +- .../UnitTests/CProgressBar/Make.defs | 2 +- .../UnitTests/CRadioButton/Make.defs | 2 +- .../UnitTests/CScrollbarHorizontal/Make.defs | 2 +- .../UnitTests/CScrollbarVertical/Make.defs | 2 +- .../UnitTests/CSliderHorizonal/Make.defs | 2 +- .../UnitTests/CSliderVertical/Make.defs | 2 +- .../NxWidgets/UnitTests/CTextBox/Make.defs | 2 +- graphics/NxWidgets/UnitTests/Kconfig.SAVE | 103 ++++++++++++++++++ graphics/NxWidgets/UnitTests/Make.defs | 37 +++++++ graphics/NxWidgets/UnitTests/Makefile | 1 - graphics/NxWidgets/UnitTests/nxwm/Make.defs | 2 +- graphics/NxWidgets/libnxwidgets/Make.defs | 40 +++++++ graphics/NxWidgets/libnxwidgets/Makefile | 22 ++-- graphics/NxWidgets/nxwm/Make.defs | 40 +++++++ graphics/NxWidgets/nxwm/Makefile | 4 +- 27 files changed, 289 insertions(+), 33 deletions(-) create mode 100644 graphics/NxWidgets/Make.defs create mode 100644 graphics/NxWidgets/UnitTests/Kconfig.SAVE create mode 100644 graphics/NxWidgets/UnitTests/Make.defs create mode 100644 graphics/NxWidgets/libnxwidgets/Make.defs create mode 100644 graphics/NxWidgets/nxwm/Make.defs diff --git a/graphics/NxWidgets/Make.defs b/graphics/NxWidgets/Make.defs new file mode 100644 index 000000000..16a42e33a --- /dev/null +++ b/graphics/NxWidgets/Make.defs @@ -0,0 +1,37 @@ +############################################################################ +# apps/graphics/NxWidgets/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2018 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +include $(wildcard graphics/NxWidgets/*/Make.defs) diff --git a/graphics/NxWidgets/UnitTests/CButton/Make.defs b/graphics/NxWidgets/UnitTests/CButton/Make.defs index 094cac770..487651aa1 100644 --- a/graphics/NxWidgets/UnitTests/CButton/Make.defs +++ b/graphics/NxWidgets/UnitTests/CButton/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTON) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTON),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CButton endif diff --git a/graphics/NxWidgets/UnitTests/CButtonArray/Make.defs b/graphics/NxWidgets/UnitTests/CButtonArray/Make.defs index 66bfc997c..d23838eab 100644 --- a/graphics/NxWidgets/UnitTests/CButtonArray/Make.defs +++ b/graphics/NxWidgets/UnitTests/CButtonArray/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CButtonArray endif diff --git a/graphics/NxWidgets/UnitTests/CCheckBox/Make.defs b/graphics/NxWidgets/UnitTests/CCheckBox/Make.defs index 91bc38043..49efa4bfc 100644 --- a/graphics/NxWidgets/UnitTests/CCheckBox/Make.defs +++ b/graphics/NxWidgets/UnitTests/CCheckBox/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CCHECKBOX) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CCHECKBOX),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CCheckBox endif diff --git a/graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs b/graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs index 16f4ba140..9bb8c01fb 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs +++ b/graphics/NxWidgets/UnitTests/CGlyphButton/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CGlyphButton endif diff --git a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs index 3ab057bf0..db69abb2d 100644 --- a/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs +++ b/graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CGlyphSliderHorizontal endif diff --git a/graphics/NxWidgets/UnitTests/CImage/Make.defs b/graphics/NxWidgets/UnitTests/CImage/Make.defs index e786e9a18..0a47854d4 100644 --- a/graphics/NxWidgets/UnitTests/CImage/Make.defs +++ b/graphics/NxWidgets/UnitTests/CImage/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CIMAGE) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CIMAGE),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CImage endif diff --git a/graphics/NxWidgets/UnitTests/CKeypad/Make.defs b/graphics/NxWidgets/UnitTests/CKeypad/Make.defs index 3b91403e6..5a51a7dcc 100644 --- a/graphics/NxWidgets/UnitTests/CKeypad/Make.defs +++ b/graphics/NxWidgets/UnitTests/CKeypad/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CKEYPAD) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CKEYPAD),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CKeypad endif diff --git a/graphics/NxWidgets/UnitTests/CLabel/Make.defs b/graphics/NxWidgets/UnitTests/CLabel/Make.defs index c64b598ff..87f71cece 100644 --- a/graphics/NxWidgets/UnitTests/CLabel/Make.defs +++ b/graphics/NxWidgets/UnitTests/CLabel/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CLABEL) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLABEL),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CLabel endif diff --git a/graphics/NxWidgets/UnitTests/CLatchButton/Make.defs b/graphics/NxWidgets/UnitTests/CLatchButton/Make.defs index e467c6c93..e3784690f 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButton/Make.defs +++ b/graphics/NxWidgets/UnitTests/CLatchButton/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CLatchButton endif diff --git a/graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs b/graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs index 1bbabb369..a2ec346cc 100644 --- a/graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs +++ b/graphics/NxWidgets/UnitTests/CLatchButtonArray/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CLatchButtonArray endif diff --git a/graphics/NxWidgets/UnitTests/CListBox/Make.defs b/graphics/NxWidgets/UnitTests/CListBox/Make.defs index 5bcca20c9..7a1b64bcc 100644 --- a/graphics/NxWidgets/UnitTests/CListBox/Make.defs +++ b/graphics/NxWidgets/UnitTests/CListBox/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CLISTBOX) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CLISTBOX),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CListBox endif diff --git a/graphics/NxWidgets/UnitTests/CProgressBar/Make.defs b/graphics/NxWidgets/UnitTests/CProgressBar/Make.defs index 1afa77080..e7b4f004f 100644 --- a/graphics/NxWidgets/UnitTests/CProgressBar/Make.defs +++ b/graphics/NxWidgets/UnitTests/CProgressBar/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CProgressBar endif diff --git a/graphics/NxWidgets/UnitTests/CRadioButton/Make.defs b/graphics/NxWidgets/UnitTests/CRadioButton/Make.defs index 7de733952..762432c4b 100644 --- a/graphics/NxWidgets/UnitTests/CRadioButton/Make.defs +++ b/graphics/NxWidgets/UnitTests/CRadioButton/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CRadioButton endif diff --git a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs index 8b24d9930..7d4587a24 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs +++ b/graphics/NxWidgets/UnitTests/CScrollbarHorizontal/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CScrollbarHorizontal endif diff --git a/graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs b/graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs index 51b2df8fc..86d68f904 100644 --- a/graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs +++ b/graphics/NxWidgets/UnitTests/CScrollbarVertical/Make.defs @@ -34,7 +34,7 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CScrollbarVertical endif diff --git a/graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs b/graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs index fb775b8ff..73125b5fd 100644 --- a/graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs +++ b/graphics/NxWidgets/UnitTests/CSliderHorizonal/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CSliderHorizonal endif diff --git a/graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs b/graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs index 97136138a..503310226 100644 --- a/graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs +++ b/graphics/NxWidgets/UnitTests/CSliderVertical/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CSliderVertical endif diff --git a/graphics/NxWidgets/UnitTests/CTextBox/Make.defs b/graphics/NxWidgets/UnitTests/CTextBox/Make.defs index 914a66ad8..6615201da 100644 --- a/graphics/NxWidgets/UnitTests/CTextBox/Make.defs +++ b/graphics/NxWidgets/UnitTests/CTextBox/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/CTextBox endif diff --git a/graphics/NxWidgets/UnitTests/Kconfig.SAVE b/graphics/NxWidgets/UnitTests/Kconfig.SAVE new file mode 100644 index 000000000..8d160feeb --- /dev/null +++ b/graphics/NxWidgets/UnitTests/Kconfig.SAVE @@ -0,0 +1,103 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +menu "Unit Tests" + +config NXWIDGETS_UNITTEST_CBUTTON + tristate "CButton" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CBUTTONARRAY + tristate "CButtonArray" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CCHECKBOX + tristate "CCheckBox" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CGLYPHBUTTON + tristate "CGlyphButton" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL + tristate "CGlyphSliderHorizontal" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CIMAGE + tristate "CImage" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CKEYPAD + tristate "CKeypad" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CLABEL + tristate "CLabel" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CLATCHBUTTON + tristate "CLatchButton" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY + tristate "CLatchButtonArray" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CLISTBOX + tristate "CListBox" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CPROGRESSBAR + tristate "CProgressBar" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CRADIOBUTTON + tristate "CRadioButton" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL + tristate "CScrollbarHorizontal" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL + tristate "CScrollbarVertical" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CSLIDERHORIZONAL + tristate "CSliderHorizontal" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CSLIDERVERTICAL + tristate "CSliderVertical" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_CTEXTBOX + tristate "CTextBox" + default n + depends on NXWIDGETS + +config NXWIDGETS_UNITTEST_NXWM + tristate "NxWM" + default y + depends on NXWM + +endmenu # Unit Tests diff --git a/graphics/NxWidgets/UnitTests/Make.defs b/graphics/NxWidgets/UnitTests/Make.defs new file mode 100644 index 000000000..176372f1d --- /dev/null +++ b/graphics/NxWidgets/UnitTests/Make.defs @@ -0,0 +1,37 @@ +############################################################################ +# apps/graphics/NxWidgets/UnitTests/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2018 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +include $(wildcard graphics/NxWidgets/UnitTests/*/Make.defs) diff --git a/graphics/NxWidgets/UnitTests/Makefile b/graphics/NxWidgets/UnitTests/Makefile index 1f2cf3690..b909e4fc8 100644 --- a/graphics/NxWidgets/UnitTests/Makefile +++ b/graphics/NxWidgets/UnitTests/Makefile @@ -34,4 +34,3 @@ ############################################################################ include $(APPDIR)/Directory.mk - diff --git a/graphics/NxWidgets/UnitTests/nxwm/Make.defs b/graphics/NxWidgets/UnitTests/nxwm/Make.defs index 784e9c798..20b1e0483 100644 --- a/graphics/NxWidgets/UnitTests/nxwm/Make.defs +++ b/graphics/NxWidgets/UnitTests/nxwm/Make.defs @@ -34,6 +34,6 @@ # ############################################################################ -if ($(CONFIG_NXWIDGETS_UNITTEST_NXWM) +ifeq ($(CONFIG_NXWIDGETS_UNITTEST_NXWM),y) CONFIGURED_APPS += graphics/NxWidgets/UnitTests/nxwm endif diff --git a/graphics/NxWidgets/libnxwidgets/Make.defs b/graphics/NxWidgets/libnxwidgets/Make.defs new file mode 100644 index 000000000..e724dec62 --- /dev/null +++ b/graphics/NxWidgets/libnxwidgets/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/graphics/NxWidgets/libnxwidgets/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NXWIDGETS),y) +CONFIGURED_APPS += graphics/NxWidgets/libnxwidgets +endif + diff --git a/graphics/NxWidgets/libnxwidgets/Makefile b/graphics/NxWidgets/libnxwidgets/Makefile index 7e0db061f..a71d18344 100644 --- a/graphics/NxWidgets/libnxwidgets/Makefile +++ b/graphics/NxWidgets/libnxwidgets/Makefile @@ -35,26 +35,22 @@ -include $(TOPDIR)/Make.defs -# Control build verbosity - -ifeq ($(V),1) -export Q := -else -export Q := @ -endif - NXWIDGETDIR := ${shell pwd | sed -e 's/ /\\ /g'} ASRCS = CSRCS = + # Infrastructure + CXXSRCS = cbitmap.cxx cbgwindow.cxx ccallback.cxx cgraphicsport.cxx CXXSRCS += clistdata.cxx clistdataitem.cxx cnxfont.cxx CXXSRCS += cnxserver.cxx cnxstring.cxx cnxtimer.cxx cnxwidget.cxx cnxwindow.cxx CXXSRCS += cnxtkwindow.cxx cnxtoolbar.cxx crect.cxx crlepalettebitmap.cxx -CXXSRCS += cscaledbitmap.cxx cstringiterator.cxx ctext.cxx cwidgetcontrol.cxx cwidgeteventhandlerlist.cxx -CXXSRCS += cwindoweventhandlerlist.cxx singletons.cxx +CXXSRCS += cscaledbitmap.cxx cstringiterator.cxx ctext.cxx cwidgetcontrol.cxx +CXXSRCS += cwidgeteventhandlerlist.cxx cwindoweventhandlerlist.cxx singletons.cxx + # Widget APIs + CXXSRCS += cbutton.cxx cbuttonarray.cxx ccheckbox.cxx ccyclebutton.cxx CXXSRCS += cglyphbutton.cxx cglyphsliderhorizontal.cxx cglyphsliderhorizontalgrip.cxx CXXSRCS += cimage.cxx ckeypad.cxx clabel.cxx clatchbutton.cxx @@ -66,7 +62,9 @@ CXXSRCS += cscrollingpanel.cxx cscrollingtextbox.cxx csliderhorizontal.cxx CXXSRCS += csliderhorizontalgrip.cxx cslidervertical.cxx csliderverticalgrip.cxx CXXSRCS += cstickybutton.cxx cstickybuttonarray.cxx cstickyimage.cxx ctabpanel.cxx CXXSRCS += ctextbox.cxx + # Images + CXXSRCS += glyph_nxlogo160x160.cxx glyph_nxlogo320x320.cxx CXXSRCS += glyph_arrowdown.cxx glyph_checkboxon.cxx glyph_screendepthup.cxx CXXSRCS += glyph_arrowleft.cxx glyph_control.cxx glyph_screenflipdown.cxx @@ -76,9 +74,11 @@ CXXSRCS += glyph_backspace.cxx glyph_radiobuttonmu.cxx glyph_windowclose.cxx CXXSRCS += glyph_capslock.cxx glyph_radiobuttonon.cxx glyph_windowdepthdown.cxx CXXSRCS += glyph_checkboxmu.cxx glyph_return.cxx glyph_windowdepthup.cxx CXXSRCS += glyph_checkboxoff.cxx glyph_screendepthdown.cxx -SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include} CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include} +VPATH = $(NXWIDGETDIR)$(DELIM)src + include $(APPDIR)/Application.mk + diff --git a/graphics/NxWidgets/nxwm/Make.defs b/graphics/NxWidgets/nxwm/Make.defs new file mode 100644 index 000000000..01034d6e8 --- /dev/null +++ b/graphics/NxWidgets/nxwm/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/graphics/NxWidgets/nxwm/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +ifeq ($(CONFIG_NXWM),y) +CONFIGURED_APPS += graphics/NxWidgets/nxwm +endif + diff --git a/graphics/NxWidgets/nxwm/Makefile b/graphics/NxWidgets/nxwm/Makefile index d44dfdd87..105910f47 100644 --- a/graphics/NxWidgets/nxwm/Makefile +++ b/graphics/NxWidgets/nxwm/Makefile @@ -87,11 +87,11 @@ CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx endif endif -SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) - CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)$(DELIM)include} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include} CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)$(DELIM)include} CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include} +VPATH = $(NXWIDGETDIR)$(DELIM)src + include $(APPDIR)/Application.mk