changeset 468:ae784a86ba82 Android_Skia

C++ instead of C to bridge to Skia
author Thinker K.F. Li <thinker@branda.to>
date Thu, 12 Nov 2009 21:26:10 +0800
parents 6e18550c8fa8
children 4dc0be6c044a
files configure.ac src/Makefile.am src/graph_engine_skia.c src/graph_engine_skia.cpp
diffstat 4 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu Nov 12 21:24:35 2009 +0800
+++ b/configure.ac	Thu Nov 12 21:26:10 2009 +0800
@@ -9,6 +9,7 @@
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 LT_INIT
 AC_PROG_LIBTOOL
 
--- a/src/Makefile.am	Thu Nov 12 21:24:35 2009 +0800
+++ b/src/Makefile.am	Thu Nov 12 21:26:10 2009 +0800
@@ -39,7 +39,7 @@
 endif
 
 if SKIA_GRAPH_ENGINE
-libmbfly_la_SOURCES += graph_engine_skia.c
+libmbfly_la_SOURCES += graph_engine_skia.cpp
 endif
 
 X_main_SOURCES = X_main.c
--- a/src/graph_engine_skia.c	Thu Nov 12 21:24:35 2009 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#include "mb_graph_engine_skia.h"
-#include "mb_shapes.h"
-
-#ifndef ASSERT
-#define ASSERT(x)
-#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/graph_engine_skia.cpp	Thu Nov 12 21:26:10 2009 +0800
@@ -0,0 +1,6 @@
+#include "mb_graph_engine_skia.h"
+#include "mb_shapes.h"
+
+#ifndef ASSERT
+#define ASSERT(x)
+#endif