diff options
| author | Ravi Nanjundappa <nravi.n@samsung.com> | 2014-06-30 17:05:26 +0530 |
|---|---|---|
| committer | Bryce Harrington <b.harrington@samsung.com> | 2014-07-08 11:09:04 -0700 |
| commit | 7bd68b57999bf1564ecbadf6c9aae6bf9f7aa4a7 (patch) | |
| tree | bef22445da8b6160a7924d666d73a714a73ee9e9 /configure.ac | |
| parent | be62b1221169469c8923a5a1ec669761f5344c57 (diff) | |
skia: update the source to build with the latest skia
This fixes several build related issues for the skia backend
which is introduced due to skia source up-gradation.
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index fdcb2dce2..04479ff59 100644 --- a/configure.ac +++ b/configure.ac @@ -249,16 +249,16 @@ CAIRO_ENABLE_SURFACE_BACKEND(skia, Skia, no, [ [directory to find compiled skia sources])], [skia_DIR="$withval"], [skia_DIR="`pwd`/../skia"]) - AC_ARG_WITH([skia-bulid], - [AS_HELP_STRING([--with-skia-build=(Release|Debug)] + AC_ARG_WITH([skia-build-type], + [AS_HELP_STRING([--with-skia-build-type=(Release|Debug)] [build of skia to link with, default is Release])], - [skia_BUILD="$withval"], - [skia_BUILD="Release"]) + [skia_BUILD_TYPE="$withval"], + [skia_BUILD_TYPE="Release"]) skia_NONPKGCONFIG_CFLAGS="-I$skia_DIR/include/config -I$skia_DIR/include/core -I$skia_DIR/include/effects" - if test "x$skia_BUILD" = x"Release"; then + if test "x$skia_BUILD_TYPE" = "xRelease"; 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" + skia_NONPKGCONFIG_LIBS="-L$skia_DIR/out/$skia_BUILD_TYPE/lib.target/ -lskia -lstdc++" AC_SUBST(skia_DIR) ]) |