sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make graphics build system work like other directories

Browse Source
This commit is contained in:
Gregory Nutt 2016-04-13 15:39:03 -06:00
parent 81fe96e69a
commit ecf0bcf13c
6 changed files with 93 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
graphics/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# graphics/Makefile # graphics/Makefile
# #
# Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2008-2009, 2011-2012, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -41,34 +41,17 @@ ifeq ($(WINTOOL),y)
INCDIROPT = -w INCDIROPT = -w
endif endif
ASRCS =
CSRCS =
VPATH =
include nxglib/Make.defs include nxglib/Make.defs
DEPPATH += --dep-path nxglib
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxglib}
include nxbe/Make.defs include nxbe/Make.defs
DEPPATH += --dep-path nxbe
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxbe}
ifeq ($(CONFIG_NX_MULTIUSER),y)
include nxmu/Make.defs include nxmu/Make.defs
DEPPATH += --dep-path nxmu
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxmu}
else
include nxsu/Make.defs include nxsu/Make.defs
DEPPATH += --dep-path nxsu
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxsu}
endif
ifeq ($(CONFIG_NXTERM),y)
include nxterm/Make.defs include nxterm/Make.defs
DEPPATH += --dep-path nxterm
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxterm}
endif
ASRCS = $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS) $(NXTERM_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT)) AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = $(NXGLIB_CSRCS) $(NXBE_CSRCS) $(NX_CSRCS) $(NXTK_CSRCS) $(NXTERM_CSRCS)
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)
@ -76,12 +59,6 @@ OBJS = $(AOBJS) $(COBJS)
BIN = libgraphics$(LIBEXT) BIN = libgraphics$(LIBEXT)
ifeq ($(CONFIG_NX_MULTIUSER),y)
VPATH = nxglib:nxbe:nxmu:nxterm
else
VPATH = nxglib:nxbe:nxsu:nxterm
endif
all: mklibgraphics all: mklibgraphics
.PHONY : context depend clean distclean mklibgraphics gensources gen1bppsources \ .PHONY : context depend clean distclean mklibgraphics gensources gen1bppsources \
gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource \ gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource \

17
graphics/nxbe/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# graphics/nxbe/Make.defs # graphics/nxbe/Make.defs
# #
# Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2011, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -33,9 +33,12 @@
# #
############################################################################ ############################################################################
NXBE_ASRCS = CSRCS += nxbe_bitmap.c nxbe_configure.c nxbe_colormap.c nxbe_clipper.c
NXBE_CSRCS = nxbe_bitmap.c nxbe_configure.c nxbe_colormap.c nxbe_clipper.c \ CSRCS += nxbe_closewindow.c nxbe_fill.c nxbe_filltrapezoid.c
nxbe_closewindow.c nxbe_fill.c nxbe_filltrapezoid.c \ CSRCS += nxbe_getrectangle.c nxbe_lower.c nxbe_move.c nxbe_raise.c
nxbe_getrectangle.c nxbe_lower.c nxbe_move.c nxbe_raise.c \ CSRCS += nxbe_redraw.c nxbe_redrawbelow.c nxbe_setpixel.c nxbe_setposition.c
nxbe_redraw.c nxbe_redrawbelow.c nxbe_setpixel.c nxbe_setposition.c \ CSRCS += nxbe_setsize.c nxbe_visible.c
nxbe_setsize.c nxbe_visible.c
DEPPATH += --dep-path nxbe
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxbe}
VPATH += :nxbe

58
graphics/nxglib/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# graphics/nxglib/Make.defs # graphics/nxglib/Make.defs
# #
# Copyright (C) 2008, 2010-2011, 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2010-2011, 2013, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -33,37 +33,37 @@
# #
############################################################################ ############################################################################
NXGLIB_ASRCS = CSRCS += nxglib_setpixel_1bpp.c nxglib_setpixel_2bpp.c
CSRCS += nxglib_setpixel_4bpp.c nxglib_setpixel_8bpp.c
CSRCS += nxglib_setpixel_16bpp.c nxglib_setpixel_24bpp.c
CSRCS += nxglib_setpixel_32bpp.c
SETP_CSRCS = nxglib_setpixel_1bpp.c nxglib_setpixel_2bpp.c CSRCS += nxglib_fillrectangle_1bpp.c nxglib_fillrectangle_2bpp.c
SETP_CSRCS += nxglib_setpixel_4bpp.c nxglib_setpixel_8bpp.c CSRCS += nxglib_fillrectangle_4bpp.c nxglib_fillrectangle_8bpp.c
SETP_CSRCS += nxglib_setpixel_16bpp.c nxglib_setpixel_24bpp.c CSRCS += nxglib_fillrectangle_16bpp.c nxglib_fillrectangle_24bpp.c
SETP_CSRCS += nxglib_setpixel_32bpp.c CSRCS += nxglib_fillrectangle_32bpp.c
RFILL_CSRCS = nxglib_fillrectangle_1bpp.c nxglib_fillrectangle_2bpp.c CSRCS += nxglib_getrectangle_1bpp.c nxglib_getrectangle_2bpp.c
RFILL_CSRCS += nxglib_fillrectangle_4bpp.c nxglib_fillrectangle_8bpp.c CSRCS += nxglib_getrectangle_4bpp.c nxglib_getrectangle_8bpp.c
RFILL_CSRCS += nxglib_fillrectangle_16bpp.c nxglib_fillrectangle_24bpp.c CSRCS += nxglib_getrectangle_16bpp.c nxglib_getrectangle_24bpp.c
RFILL_CSRCS += nxglib_fillrectangle_32bpp.c CSRCS += nxglib_getrectangle_32bpp.c
RGET_CSRCS = nxglib_getrectangle_1bpp.c nxglib_getrectangle_2bpp.c CSRCS += nxglib_filltrapezoid_1bpp.c nxglib_filltrapezoid_2bpp.c
RGET_CSRCS += nxglib_getrectangle_4bpp.c nxglib_getrectangle_8bpp.c CSRCS += nxglib_filltrapezoid_4bpp.c nxglib_filltrapezoid_8bpp.c
RGET_CSRCS += nxglib_getrectangle_16bpp.c nxglib_getrectangle_24bpp.c CSRCS += nxglib_filltrapezoid_16bpp.c nxglib_filltrapezoid_24bpp.c
RGET_CSRCS += nxglib_getrectangle_32bpp.c CSRCS += nxglib_filltrapezoid_32bpp.c
TFILL_CSRCS = nxglib_filltrapezoid_1bpp.c nxglib_filltrapezoid_2bpp.c CSRCS += nxglib_moverectangle_1bpp.c nxglib_moverectangle_2bpp.c
TFILL_CSRCS += nxglib_filltrapezoid_4bpp.c nxglib_filltrapezoid_8bpp.c CSRCS += nxglib_moverectangle_4bpp.c nxglib_moverectangle_8bpp.c
TFILL_CSRCS += nxglib_filltrapezoid_16bpp.c nxglib_filltrapezoid_24bpp.c CSRCS += nxglib_moverectangle_16bpp.c nxglib_moverectangle_24bpp.c
TFILL_CSRCS += nxglib_filltrapezoid_32bpp.c CSRCS += nxglib_moverectangle_32bpp.c
RMOVE_CSRCS = nxglib_moverectangle_1bpp.c nxglib_moverectangle_2bpp.c CSRCS += nxglib_copyrectangle_1bpp.c nxglib_copyrectangle_2bpp.c
RMOVE_CSRCS += nxglib_moverectangle_4bpp.c nxglib_moverectangle_8bpp.c CSRCS += nxglib_copyrectangle_4bpp.c nxglib_copyrectangle_8bpp.c
RMOVE_CSRCS += nxglib_moverectangle_16bpp.c nxglib_moverectangle_24bpp.c CSRCS += nxglib_copyrectangle_16bpp.c nxglib_copyrectangle_24bpp.c
RMOVE_CSRCS += nxglib_moverectangle_32bpp.c CSRCS += nxglib_copyrectangle_32bpp.c
RCOPY_CSRCS = nxglib_copyrectangle_1bpp.c nxglib_copyrectangle_2bpp.c DEPPATH += --dep-path nxglib
RCOPY_CSRCS += nxglib_copyrectangle_4bpp.c nxglib_copyrectangle_8bpp.c CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxglib}
RCOPY_CSRCS += nxglib_copyrectangle_16bpp.c nxglib_copyrectangle_24bpp.c #VPATH += :nxglib
RCOPY_CSRCS += nxglib_copyrectangle_32bpp.c VPATH = nxglib
NXGLIB_CSRCS = $(SETP_CSRCS) $(RFILL_CSRCS) $(RGET_CSRCS) $(TFILL_CSRCS)
NXGLIB_CSRCS += $(RMOVE_CSRCS) $(RCOPY_CSRCS)

18
graphics/nxmu/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# graphics/nxmu/Make.defs # graphics/nxmu/Make.defs
# #
# Copyright (C) 2008, 2011-2013 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2011-2013, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -33,12 +33,18 @@
# #
############################################################################ ############################################################################
NX_ASRCS = ifeq ($(CONFIG_NX_MULTIUSER),y)
NX_CSRCS += nxmu_kbdin.c nxmu_mouse.c nxmu_openwindow.c nxmu_redrawreq.c CSRCS += nxmu_kbdin.c nxmu_mouse.c nxmu_openwindow.c nxmu_redrawreq.c
NX_CSRCS += nxmu_releasebkgd.c nxmu_requestbkgd.c nxmu_reportposition.c CSRCS += nxmu_releasebkgd.c nxmu_requestbkgd.c nxmu_reportposition.c
NX_CSRCS += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c CSRCS += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c
ifeq ($(CONFIG_NX_NXSTART),y) ifeq ($(CONFIG_NX_NXSTART),y)
NX_CSRCS += nx_start.c CSRCS += nx_start.c
endif
DEPPATH += --dep-path nxmu
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxmu}
VPATH += :nxmu
endif endif

24
graphics/nxsu/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# graphics/nxsu/Make.defs # graphics/nxsu/Make.defs
# #
# Copyright (C) 2008, 2011, 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2011, 2013, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -33,12 +33,18 @@
# #
############################################################################ ############################################################################
NX_ASRCS = ifneq ($(CONFIG_NX_MULTIUSER),y)
NX_CSRCS = nx_bitmap.c nx_close.c nx_closewindow.c nx_fill.c CSRCS += nx_bitmap.c nx_close.c nx_closewindow.c nx_fill.c
NX_CSRCS += nx_filltrapezoid.c nx_getposition.c nx_getrectangle.c nx_kbdchin.c CSRCS += nx_filltrapezoid.c nx_getposition.c nx_getrectangle.c nx_kbdchin.c
NX_CSRCS += nx_kbdin.c nx_lower.c nx_mousein.c nx_move.c nx_open.c CSRCS += nx_kbdin.c nx_lower.c nx_mousein.c nx_move.c nx_open.c
NX_CSRCS += nx_openwindow.c nx_raise.c nx_redrawreq.c nx_releasebkgd.c CSRCS += nx_openwindow.c nx_raise.c nx_redrawreq.c nx_releasebkgd.c
NX_CSRCS += nx_requestbkgd.c nx_setpixel.c nx_setsize.c nx_setbgcolor.c CSRCS += nx_requestbkgd.c nx_setpixel.c nx_setsize.c nx_setbgcolor.c
NX_CSRCS += nx_setposition.c nx_constructwindow.c nxsu_redrawreq.c CSRCS += nx_setposition.c nx_constructwindow.c nxsu_redrawreq.c
NX_CSRCS += nxsu_reportposition.c CSRCS += nxsu_reportposition.c
DEPPATH += --dep-path nxsu
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxsu}
VPATH += :nxsu
endif

21
graphics/nxterm/Make.defs
View File

@ -33,16 +33,23 @@
# #
############################################################################ ############################################################################
NXTERM_ASRCS = ifeq ($(CONFIG_NXTERM),y)
NXTERM_CSRCS = nx_register.c nxterm_driver.c nxterm_font.c nxterm_putc.c
NXTERM_CSRCS += nxterm_redraw.c nxterm_register.c nxterm_scroll.c CSRCS += nx_register.c nxterm_driver.c nxterm_font.c nxterm_putc.c
NXTERM_CSRCS += nxterm_vt100.c nxterm_unregister.c nxtk_register.c CSRCS += nxterm_redraw.c nxterm_register.c nxterm_scroll.c
NXTERM_CSRCS += nxtool_register.c CSRCS += nxterm_vt100.c nxterm_unregister.c nxtk_register.c
CSRCS += nxtool_register.c
ifeq ($(CONFIG_NXTERM_NXKBDIN),y) ifeq ($(CONFIG_NXTERM_NXKBDIN),y)
NXTERM_CSRCS += nxterm_kbdin.c CSRCS += nxterm_kbdin.c
endif endif
ifeq ($(CONFIG_DEBUG),y) ifeq ($(CONFIG_DEBUG),y)
NXTERM_CSRCS += nxterm_sem.c CSRCS += nxterm_sem.c
endif
DEPPATH += --dep-path nxterm
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxterm}
VPATH += :nxterm
endif endif