Mercurial > MadButterfly
changeset 633:6f71f1b8e4e7
Let compilation on SMP8655 succeeded.
author | Shih-Yuan Lee (FourDollars) <fourdollars@gmail.com> |
---|---|
date | Sat, 24 Jul 2010 16:13:06 +0800 |
parents | ae787bcb475a |
children | 2f60a2dbe0b3 |
files | build-mipsel.sh configure.ac include/mb_graph_engine_cairo.h |
diffstat | 3 files changed, 16 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/build-mipsel.sh Sat Jul 24 16:13:06 2010 +0800 @@ -0,0 +1,5 @@ +#!/bin/sh + +autoreconf -ifs +./configure --host mipsel-linux --build i686-pc-linux-gnu --prefix ${TANGO} --disable-sh_text --disable-X_supp +make && make install
--- a/configure.ac Sun Jul 11 18:36:12 2010 +0800 +++ b/configure.ac Sat Jul 24 16:13:06 2010 +0800 @@ -126,7 +126,9 @@ [if [ x"${cairo}" = xtrue ]; then] PKG_CHECK_MODULES([cairo], [cairo >= 1.6], , AC_MSG_ERROR([cairo >= 1.6 not found])) - PKG_CHECK_MODULES([pangocairo], [pangocairo >= 1.0], , AC_MSG_ERROR([pangocairo >= 1.0 not found])) + [if [ x"${sh_text}" = xtrue ]; then] + PKG_CHECK_MODULES([pangocairo], [pangocairo >= 1.0], , AC_MSG_ERROR([pangocairo >= 1.0 not found])) + [fi] [fi] AC_CONFIG_FILES([
--- a/include/mb_graph_engine_cairo.h Sun Jul 11 18:36:12 2010 +0800 +++ b/include/mb_graph_engine_cairo.h Sat Jul 24 16:13:06 2010 +0800 @@ -3,7 +3,7 @@ #include <stdio.h> #include <cairo.h> -#include <cairo-xlib.h> +#include <cairo-directfb.h> #include "mb_basic_types.h" #include "mb_img_ldr.h" @@ -99,7 +99,7 @@ static void mbe_clear(mbe_t *canvas) { cairo_operator_t old_op; - + old_op = cairo_get_operator(canvas); cairo_set_operator(canvas, CAIRO_OPERATOR_CLEAR); cairo_paint(canvas); @@ -110,7 +110,7 @@ cairo_operator_t saved_op; cairo_surface_t *surf; cairo_pattern_t *ptn; - + surf = cairo_get_target(src); ptn = cairo_pattern_create_for_surface(surf); cairo_set_source(src, ptn); @@ -131,13 +131,13 @@ options = cairo_font_options_create(); if(options == NULL) return NULL; - + MB_MATRIX_2_CAIRO(cfnt_mtx, fnt_mtx); MB_MATRIX_2_CAIRO(cctm, ctm); scaled = cairo_scaled_font_create(face, &cfnt_mtx, &cctm, options); cairo_font_options_destroy(options); - + return scaled; } @@ -147,7 +147,7 @@ int width, int height, int stride) { cairo_format_t _fmt; - + switch(fmt) { case MB_IFMT_ARGB32: _fmt = CAIRO_FORMAT_ARGB32; @@ -198,7 +198,7 @@ static mbe_surface_t * mbe_image_surface_create(mb_img_fmt_t fmt, int width, int height) { cairo_format_t _fmt; - + switch(fmt) { case MB_IFMT_ARGB32: _fmt = CAIRO_FORMAT_ARGB32; @@ -215,7 +215,7 @@ default: return NULL; } - + return cairo_image_surface_create(_fmt, width, height); }