sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
dee7f14b49
nuttx-apps/graphics/nxglyphs/Makefile

82 lines
3.2 KiB
Makefile
Raw Normal View History

Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
############################################################################
# apps/graphics/tiff/Makefile
NxWM update git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4676 42af7a65-404d-4744-a932-0658087f49c3
2012-04-30 00:10:52 +02:00
#
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
# Copyright (C) 2019 Gregory Nutt. All rights reserved.
NxWM update git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4676 42af7a65-404d-4744-a932-0658087f49c3
2012-04-30 00:10:52 +02:00
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# 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.
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
# 3. Neither the name NuttX nor the names of its contributors may be
# used to endorse or promote products derived from this software
NxWM update git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4676 42af7a65-404d-4744-a932-0658087f49c3
2012-04-30 00:10:52 +02:00
# 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.
#
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
############################################################################
NxWM update git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4676 42af7a65-404d-4744-a932-0658087f49c3
2012-04-30 00:10:52 +02:00
-include $(TOPDIR)/Make.defs
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
ifeq ($(CONFIG_NXWIDGETS),y)
# Glyphs used by NxWidgets
Final refactoring and implementation of delayed window deletion logic. Works worse now, but the changes are important and need to be checked in now git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4747 42af7a65-404d-4744-a932-0658087f49c3
2012-05-19 01:08:34 +02:00
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
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
CXXSRCS += glyph_arrowright.cxx glyph_cycle.cxx glyph_screenflipup.cxx
CXXSRCS += glyph_arrowup.cxx glyph_radiobuttonoff.cxx glyph_shift.cxx
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
libnxwidges and nwxm Makefiles should include paths to apps/include
2016-07-22 19:10:07 +02:00
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
# Glyphs used by NxWM
Add a hex calculator example to NxWM git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4760 42af7a65-404d-4744-a932-0658087f49c3
2012-05-22 21:29:22 +02:00
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
ifeq ($(CONFIG_NXGLPYHS_LARGE_ICONS),y)
# Large icons
Final refactoring and implementation of delayed window deletion logic. Works worse now, but the changes are important and need to be checked in now git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4747 42af7a65-404d-4744-a932-0658087f49c3
2012-05-19 01:08:34 +02:00
NxWM: Can now configure to use small or large icons
2014-07-13 23:58:12 +02:00
CXXSRCS += glyph_calculator47x49.cxx glyph_calibration48x42.cxx glyph_cmd49x43.cxx
CXXSRCS += glyph_minimize42x42.cxx glyph_play48x48.cxx glyph_stop42x42.cxx
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
NxWM: Can now configure to use small or large icons
2014-07-13 23:58:12 +02:00
else
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
# Small icons
NxWM: Rename all glyphs to include the size of the glyph as part of the filename
2014-07-12 22:40:15 +02:00
CXXSRCS += glyph_calculator24x25.cxx glyph_calibration24x21.cxx glyph_cmd25x22.cxx
Remove unused start icon
2014-07-13 21:52:35 +02:00
CXXSRCS += glyph_minimize21x21.cxx glyph_play24x24.cxx glyph_stop21x21.cxx
NxWM: Can now configure to use small or large icons
2014-07-13 23:58:12 +02:00
endif
NxWM update git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4676 42af7a65-404d-4744-a932-0658087f49c3
2012-04-30 00:10:52 +02:00
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
ifeq ($(CONFIG_NXGLPYHS_LARGE_ICONS),y)
# Large icons
Add larger images for media player. Also options to control spacing and borders on media player windows
2014-07-15 00:56:40 +02:00
CXXSRCS += glyph_mediaplayer44x50.cxx glyph_mplayer_controls43x41.cxx
Update media player icons again
2014-07-15 16:05:47 +02:00
CXXSRCS += glyph_mediagrip60x30.cxx
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
NxWM: Add larger media player icon
2014-07-14 17:20:13 +02:00
else
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
# Small icons
NxWM: Add larger media player icon
2014-07-14 17:20:13 +02:00
CXXSRCS += glyph_mediaplayer24x24.cxx glyph_mplayer_controls32x32.cxx
endif
Add beginning a a media player window to NxWM from Ken Pettit. Still a work in progress
2013-05-12 00:15:51 +02:00
graphics/NxWidgets: Fix some issues foundin build testing.
2018-09-16 17:25:32 +02:00
VPATH = src
apps/graphics/NxWidgets: Hooking into build system.
2018-09-16 14:52:25 +02:00
apps/graphics/NxWidgets: Some progress integrating configuration/build system
2018-09-16 00:38:39 +02:00
include $(APPDIR)/Application.mk
Squashed commit of the following: apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems. graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx. apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces. apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file. Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
2019-04-05 02:53:29 +02:00
endif # CONFIG_NXWIDGETS
Reference in New Issue Copy Permalink