diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-04-24 00:50:33 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-08-13 09:58:02 +0100 |
| commit | 1ccd269a3f33684bfbedcd94ad9bca56b1404143 (patch) | |
| tree | 0563b9114a6ddd752142232e0ae55f3e75816a90 /configure.ac | |
| parent | e849e7c9291d57c3749f499c7e410e7be452b455 (diff) | |
skia: Update to use cairo_backend_t interface
Still hopelessly broken. Requires compiling cairo to use static linking
and then still requires manual linkage to workaround libtool. Lots of
functionality is still absent - we need to either find analogues to some
Cairo operations or implement fallbacks - but it is sufficient to
investigate how Skia functions in direct comparison with Cairo for
tessellation/rasterisation.
Caveat emptor.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8e6bc4d1..0782baf2 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,8 @@ AC_GNU_SOURCE AC_USE_SYSTEM_EXTENSIONS AC_CONFIG_SRCDIR(src/cairo.h) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define]) +#AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define]) +AM_INIT_AUTOMAKE([1.9.6]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL AC_PROG_LIBTOOL dnl ([1.4]) Don't remove! @@ -199,9 +200,17 @@ CAIRO_ENABLE_SURFACE_BACKEND(skia, Skia, no, [ [AS_HELP_STRING([--with-skia=/path/to/skia], [directory to find compiled skia sources])], [skia_DIR="$withval"], - [skia_DIR="`pwd`/../mesa"]) + [skia_DIR="`pwd`/../skia"]) + AC_ARG_WITH([skia-bulid], + [AS_HELP_STRING([--with-skia-build=(Release|Debug)] + [build of skia to link with, default is Relese])], + [skia_BUILD="$withval"], + [skia_BUILD="Release"]) skia_NONPKGCONFIG_CFLAGS="-I$skia_DIR/include/config -I$skia_DIR/include/core -I$skia_DIR/include/effects" - skia_NONPKGCONFIG_LIBS="$skia_DIR/out/libskia.a" + if test "x$(skia_BUILD)" = x"Relese"; then + skia_NONPKGCONFIG_CFLAGS="-DSK_RELEASE -DSK_CAN_USE_FLOAT $skia_NONPKGCONFIG_CFLAGS" + fi + skia_NONPKGCONFIG_LIBS="--start-group $skia_DIR/out/$skia_BUILD/obj.target/gyp/libeffects.a $skia_DIR/out/$skia_BUILD/obj.target/gyp/libimages.a $skia_DIR/out/$skia_BUILD/obj.target/gyp/libutils.a $skia_DIR/out/$skia_BUILD/obj.target/gyp/libopts.a $skia_DIR/out/$skia_BUILD/obj.target/gyp/libcore.a -end-group" AC_SUBST(skia_DIR) ]) |