# HG changeset patch
# User Thinker K.F. Li <thinker@branda.to>
# Date 1258032271 -28800
# Node ID cd6f57b9b104d07b2e550041aedeb5a716754729
# Parent  d8181696b689fd2ec9d7fc5fdc434db43b46890e
Add graph_engine_skia.c

diff -r d8181696b689 -r cd6f57b9b104 configure.ac
--- 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
diff -r d8181696b689 -r cd6f57b9b104 include/mb_graph_engine.h
--- 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
 
diff -r d8181696b689 -r cd6f57b9b104 src/Makefile.am
--- 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
diff -r d8181696b689 -r cd6f57b9b104 src/event.c
--- 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
diff -r d8181696b689 -r cd6f57b9b104 src/graph_engine_skia.c
--- /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
diff -r d8181696b689 -r cd6f57b9b104 src/redraw_man.c
--- 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"