diff --git a/cake/BuildExternals.cake b/cake/BuildExternals.cake index 4f3d142e6e..cb56cd8cc8 100644 --- a/cake/BuildExternals.cake +++ b/cake/BuildExternals.cake @@ -231,7 +231,7 @@ Task ("externals-osx") .Does (() => { var buildArch = new Action ((arch, skiaArch) => { - RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1 skia_pdf_use_sfntly=0 skia_osx_deployment_target=10.8", "xcode"); + RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1 skia_osx_deployment_target=10.8", "xcode"); XCodeBuild (new XCodeBuildSettings { Project = "native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj", @@ -429,7 +429,7 @@ Task ("externals-linux") AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); var targets = - "skia_lib pdf sfntly icuuc dng_sdk libSkKTX sksl piex raw_codec zlib libetc1 " + + "skia_lib pdf dng_sdk libSkKTX sksl piex raw_codec zlib libetc1 " + "libwebp_dsp_enc opts_avx opts_sse42 opts_hsw xml svg"; var buildArch = new Action ((arch, folder) => { @@ -439,7 +439,7 @@ Task ("externals-linux") SetEnvironmentVariable ("SKIA_OUT", outPath); // build skia_lib - RunGyp ("skia_os='linux' skia_arch_type='" + arch + "' skia_gpu=1 skia_pic=1", "ninja"); + RunGyp ("skia_os='linux' skia_arch_type='" + arch + "' skia_gpu=1 skia_pic=1 skia_pdf_use_sfntly=0", "ninja"); RunProcess (ninja, new ProcessSettings { Arguments = "-C out/" + folder + "/Release " + targets, WorkingDirectory = SKIA_PATH.FullPath, diff --git a/native-builds/libSkiaSharp_linux/Makefile b/native-builds/libSkiaSharp_linux/Makefile index e929bd8523..2bd5caed3e 100644 --- a/native-builds/libSkiaSharp_linux/Makefile +++ b/native-builds/libSkiaSharp_linux/Makefile @@ -61,8 +61,6 @@ library_paths = \ ../../externals/skia/out/${ARCH}/Release/obj/gyp/libjpeg-turbo.a \ ../../externals/skia/out/${ARCH}/Release/obj/gyp/libzlib.a \ ../../externals/skia/out/${ARCH}/Release/obj/gyp/libetc1.a \ - ../../externals/skia/out/${ARCH}/Release/obj/gyp/libsfntly.a \ - ../../externals/skia/out/${ARCH}/Release/obj/gyp/libicuuc.a \ ../../externals/skia/out/${ARCH}/Release/obj/gyp/libraw_codec.a \ ../../externals/skia/out/${ARCH}/Release/obj/gyp/libSkKTX.a \ ../../externals/skia/out/${ARCH}/Release/obj/gyp/libdng_sdk.a \