nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 10:58:49 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separating out framebuffer dependencies

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2595 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-04-17 01:46:15 +00:00
parent b1bf249a49
commit 6a503c11ea
19 changed files with 37 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
graphics/nxglib/Makefile.sources
View file

@ -1,7 +1,7 @@
############################################################################
# graphics/nxglib/Makefile.sources
#
# Copyright (C) 2008 Gregory Nutt. All rights reserved.
# Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
#
# Redistribution and use in source and binary forms, with or without
@ -96,33 +96,39 @@ RCOPY_TMP = $(RCOPY_CSRC:.c=.i)
GEN_CSRCS = $(RFILL_CSRC) $(TFILL_CSRC) $(RMOVE_CSRC) $(RCOPY_CSRC)
ifeq ($(CONFIG_NX_LCDDRIVER),y)
BLITDIR = lcd
else
BLITDIR = fb
endif
all: $(GEN_CSRCS)
.PHONY : clean distclean
$(RFILL_CSRC) : nxglib_fillrectangle.c nxglib_bitblit.h
$(RFILL_CSRC) : $(BLITDIR)/nxglib_fillrectangle.c nxglib_bitblit.h
ifneq ($(NXGLIB_BITSPERPIXEL),)
@$(call PREPROCESS, nxglib_fillrectangle.c, $(RFILL_TMP))
@$(call PREPROCESS, $(BLITDIR)/nxglib_fillrectangle.c, $(RFILL_TMP))
@cat $(RFILL_TMP) | sed -e "/^#/d" >$@
@rm -f $(RFILL_TMP)
endif
$(TFILL_CSRC) : nxglib_filltrapezoid.c nxglib_bitblit.h
$(TFILL_CSRC) : $(BLITDIR)/nxglib_filltrapezoid.c nxglib_bitblit.h
ifneq ($(NXGLIB_BITSPERPIXEL),)
@$(call PREPROCESS, nxglib_filltrapezoid.c, $(TFILL_TMP))
@$(call PREPROCESS, $(BLITDIR)/nxglib_filltrapezoid.c, $(TFILL_TMP))
@cat $(TFILL_TMP) | sed -e "/^#/d" >$@
@rm -f $(TFILL_TMP)
endif
$(RMOVE_CSRC) : nxglib_moverectangle.c nxglib_bitblit.h
$(RMOVE_CSRC) : $(BLITDIR)/nxglib_moverectangle.c nxglib_bitblit.h
ifneq ($(NXGLIB_BITSPERPIXEL),)
@$(call PREPROCESS, nxglib_moverectangle.c, $(RMOVE_TMP))
@$(call PREPROCESS, $(BLITDIR)/nxglib_moverectangle.c, $(RMOVE_TMP))
@cat $(RMOVE_TMP) | sed -e "/^#/d" >$@
@rm -f $(RMOVE_TMP)
endif
$(RCOPY_CSRC) : nxglib_copyrectangle.c nxglib_bitblit.h
$(RCOPY_CSRC) : $(BLITDIR)/nxglib_copyrectangle.c nxglib_bitblit.h
ifneq ($(NXGLIB_BITSPERPIXEL),)
@$(call PREPROCESS, nxglib_copyrectangle.c, $(RCOPY_TMP))
@$(call PREPROCESS, $(BLITDIR)/nxglib_copyrectangle.c, $(RCOPY_TMP))
@cat $(RCOPY_TMP) | sed -e "/^#/d" >$@
@rm -f $(RCOPY_TMP)
endif

4
graphics/nxglib/nxglib_copyrectangle.c → graphics/nxglib/fb/nxglib_copyrectangle.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_copyrectangle.c
* graphics/nxglib/fb/nxsglib_copyrectangle.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
graphics/nxglib/nxglib_fillrectangle.c → graphics/nxglib/fb/nxglib_fillrectangle.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxglib_fillrectangle.c
* graphics/nxglib/fb/nxglib_fillrectangle.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
graphics/nxglib/nxglib_filltrapezoid.c → graphics/nxglib/fb/nxglib_filltrapezoid.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxglib_filltrapezoid.c
* graphics/nxglib/fb/nxglib_filltrapezoid.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
graphics/nxglib/nxglib_moverectangle.c → graphics/nxglib/fb/nxglib_moverectangle.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxglib_moverectangle.c
* graphics/nxglib/fb/nxglib_moverectangle.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

3
graphics/nxglib/nxglib_colorcopy.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_colorcopy.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_nonintersecting.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectnonintersecting.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_nullrect.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_nullrect.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -41,7 +41,6 @@
#include <stdbool.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_rectcopy.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectcopy.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_rectinside.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectinside.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -41,7 +41,6 @@
#include <stdbool.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_rectintersect.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectintersect.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_rectoffset.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectoffset.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_rectoverlap.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_nulloverlap.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -41,7 +41,6 @@
#include <stdbool.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_rectsize.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxglib_rectsize.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_rectunion.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_rectunion.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_runcopy.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_runcopy.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_trapcopy.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_trapcopy.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_vectoradd.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_vectoradd.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************

3
graphics/nxglib/nxglib_vectsubtract.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxglib/nxsglib_vectorsubtract.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <nuttx/fb.h>
#include <nuttx/nxglib.h>
/****************************************************************************