Mercurial > MadButterfly
changeset 466:cd6f57b9b104 Android_Skia
Add graph_engine_skia.c
| author | Thinker K.F. Li <thinker@branda.to> |
|---|---|
| date | Thu, 12 Nov 2009 21:24:31 +0800 |
| parents | d8181696b689 |
| children | 6e18550c8fa8 |
| files | configure.ac include/mb_graph_engine.h src/Makefile.am src/event.c src/graph_engine_skia.c src/redraw_man.c |
| diffstat | 6 files changed, 21 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Nov 12 21:22:30 2009 +0800 +++ b/configure.ac Thu Nov 12 21:24:31 2009 +0800 @@ -75,13 +75,13 @@ no) skia=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-skia]) ;; esac],[skia=false]) -AM_CONDITIONAL([SKIA_BACKEND], [test x$skia = xtrue]) -AM_CONDITIONAL([CAIRO_BACKEND], [test x$skia != xtrue]) +AM_CONDITIONAL([SKIA_GRAPH_ENGINE], [test x$skia = xtrue]) +AM_CONDITIONAL([CAIRO_GRAPH_ENGINE], [test x$skia != xtrue]) [if [ x"${skia}" = xtrue ]; then ] -AC_DEFINE([SKIA_BACKEND]) +AC_DEFINE([SKIA_GRAPH_ENGINE]) cairo=false [else] -AC_DEFINE([CAIRO_BACKEND]) +AC_DEFINE([CAIRO_GRAPH_ENGINE]) cairo=true [fi] @@ -121,8 +121,8 @@ AH_TEMPLATE([SH_TEXT],[Enable sh_text object]) AH_TEMPLATE([SH_STEXT],[Enable sh_stext object]) -AH_TEMPLATE([SKIA_BACKEND], [Enable Skia Graphic Engine]) -AH_TEMPLATE([CAIRO_BACKEND], [Enable Cairo Graphic Engine]) +AH_TEMPLATE([SKIA_GRAPH_ENGINE], [Enable Skia Graphic Engine]) +AH_TEMPLATE([CAIRO_GRAPH_ENGINE], [Enable Cairo Graphic Engine]) AH_TEMPLATE([X_SUPP], [Enable X backend]) AC_OUTPUT
--- a/include/mb_graph_engine.h Thu Nov 12 21:22:30 2009 +0800 +++ b/include/mb_graph_engine.h Thu Nov 12 21:24:31 2009 +0800 @@ -2,11 +2,11 @@ #define __MBE_H_ #include <mb_config.h> -#ifdef CAIRO_BACKEND +#ifdef CAIRO_GRAPH_ENGINE #include <mb_graph_engine_cairo.h> #endif -#ifdef SKAI_BACKEND +#ifdef SKAI_GRAPH_ENGINE #include <mb_graph_engine_skia.h> #endif
--- a/src/Makefile.am Thu Nov 12 21:22:30 2009 +0800 +++ b/src/Makefile.am Thu Nov 12 21:24:31 2009 +0800 @@ -31,13 +31,17 @@ libmbfly_la_SOURCES += X_supp.c endif -if CAIRO_BACKEND +if CAIRO_GRAPH_ENGINE libmbfly_la_SOURCES += graph_engine_cairo.c libmbfly_la_CPPFLAGS = @cairo_CFLAGS@ @pangocairo_CFLAGS@ libmbfly_la_LDFLAGS = @cairo_LIBS@ @pangocairo_LIBS@ endif +if SKIA_GRAPH_ENGINE +libmbfly_la_SOURCES += graph_engine_skia.c +endif + X_main_SOURCES = X_main.c X_main_LDADD = $(top_builddir)/src/libmbfly.la X_main_CPPFLAGS = @pangocairo_CFLAGS@ -I$(top_builddir)/include
--- a/src/event.c Thu Nov 12 21:22:30 2009 +0800 +++ b/src/event.c Thu Nov 12 21:24:31 2009 +0800 @@ -9,7 +9,7 @@ #include "mb_redraw_man.h" #include "mb_shapes.h" #endif -#include "../config.h" +#include "mb_config.h" #define OK 0 #define ERR -1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/graph_engine_skia.c Thu Nov 12 21:24:31 2009 +0800 @@ -0,0 +1,6 @@ +#include "mb_graph_engine_skia.h" +#include "mb_shapes.h" + +#ifndef ASSERT +#define ASSERT(x) +#endif
--- a/src/redraw_man.c Thu Nov 12 21:22:30 2009 +0800 +++ b/src/redraw_man.c Thu Nov 12 21:24:31 2009 +0800 @@ -9,7 +9,7 @@ #include "mb_redraw_man.h" #include "mb_observer.h" #include "mb_prop.h" -#include "../config.h" +#include "mb_config.h" /* required by rdman_img_ldr_load_paint() */ #include "mb_paint.h"