Update the managed builds with the updated native library

This commit is contained in:
Matthew Leibowitz 2017-05-06 19:26:17 -04:00
Родитель 84ac3672dc
Коммит 3579f7a9b0
15 изменённых файлов: 77 добавлений и 110 удалений

Просмотреть файл

@ -1704,10 +1704,8 @@ namespace SkiaSharp
Srgba8888,
Sbgra8888,
Etc1,
Latc,
R11Eac,
Astc12x12,
RgbaFloat,
RgFloat,
AlphaHalf,
RgbaHalf,
}

Просмотреть файл

@ -207,36 +207,48 @@ namespace SkiaSharp
SkiaApi.sk_canvas_clip_region (Handle, region.Handle, operation);
}
public SKRect ClipBounds {
[Obsolete ("Use LocalClipBounds instead.")]
public SKRect ClipBounds => LocalClipBounds;
[Obsolete ("Use DeviceClipBounds instead.")]
public SKRectI ClipDeviceBounds => DeviceClipBounds;
public SKRect LocalClipBounds {
get {
var bounds = SKRect.Empty;
if (GetClipBounds (ref bounds)) {
return bounds;
} else {
return SKRect.Empty;
}
SKRect bounds;
GetLocalClipBounds (out bounds);
return bounds;
}
}
public SKRectI ClipDeviceBounds {
public SKRectI DeviceClipBounds {
get {
var bounds = SKRectI.Empty;
if (GetClipDeviceBounds (ref bounds)) {
return bounds;
} else {
return SKRectI.Empty;
}
SKRectI bounds;
GetDeviceClipBounds (out bounds);
return bounds;
}
}
[Obsolete ("Use GetLocalClipBounds instead.")]
public bool GetClipBounds (ref SKRect bounds)
{
return SkiaApi.sk_canvas_get_clip_bounds(Handle, ref bounds);
return GetLocalClipBounds (out bounds);
}
[Obsolete ("Use GetDeviceClipBounds instead.")]
public bool GetClipDeviceBounds (ref SKRectI bounds)
{
return SkiaApi.sk_canvas_get_clip_device_bounds(Handle, ref bounds);
return GetDeviceClipBounds (out bounds);
}
public bool GetLocalClipBounds (out SKRect bounds)
{
return SkiaApi.sk_canvas_get_local_clip_bounds (Handle, out bounds);
}
public bool GetDeviceClipBounds (out SKRectI bounds)
{
return SkiaApi.sk_canvas_get_device_clip_bounds (Handle, out bounds);
}
public void DrawPaint (SKPaint paint)
@ -315,7 +327,9 @@ namespace SkiaSharp
public void DrawPoint (float x, float y, SKColor color)
{
SkiaApi.sk_canvas_draw_point_color (Handle, x, y, color);
using (var paint = new SKPaint { Color = color }) {
DrawPoint (x, y, paint);
}
}
public void DrawImage (SKImage image, float x, float y, SKPaint paint = null)

Просмотреть файл

@ -12,23 +12,8 @@ namespace SkiaSharp
{
public class SKColorFilter : SKObject
{
[Obsolete("Use MinColorCubeDimension instead.", true)]
public const int MinCubeSize = 4;
[Obsolete("Use MaxColorCubeDimension instead.", true)]
public const int MaxCubeSize = 64;
public const int MinColorCubeDimension = 4;
public const int MaxColorCubeDimension = 64;
public const int ColorMatrixSize = 20;
public static bool IsValid3DColorCube(SKData cubeData, int cubeDimension)
{
var minMemorySize = 4 * cubeDimension * cubeDimension * cubeDimension;
return
(cubeDimension >= MinColorCubeDimension) && (cubeDimension <= MaxColorCubeDimension) &&
(null != cubeData) && (cubeData.Size >= minMemorySize);
}
[Preserve]
internal SKColorFilter(IntPtr handle, bool owns)
: base (handle, owns)
@ -76,22 +61,6 @@ namespace SkiaSharp
return GetObject<SKColorFilter>(SkiaApi.sk_colorfilter_new_compose(outer.Handle, inner.Handle));
}
public static SKColorFilter CreateColorCube(byte[] cubeData, int cubeDimension)
{
if (cubeData == null)
throw new ArgumentNullException(nameof(cubeData));
return CreateColorCube(SKData.CreateCopy(cubeData), cubeDimension);
}
public static SKColorFilter CreateColorCube(SKData cubeData, int cubeDimension)
{
if (cubeData == null)
throw new ArgumentNullException(nameof(cubeData));
if (!IsValid3DColorCube(cubeData, cubeDimension))
throw new ArgumentException("Invalid cube data.", nameof(cubeData));
return GetObject<SKColorFilter>(SkiaApi.sk_colorfilter_new_color_cube(cubeData.Handle, cubeDimension));
}
public static SKColorFilter CreateColorMatrix(float[] matrix)
{
if (matrix == null)
@ -106,11 +75,6 @@ namespace SkiaSharp
return GetObject<SKColorFilter>(SkiaApi.sk_colorfilter_new_luma_color());
}
public static SKColorFilter CreateGamma(float gamma)
{
return GetObject<SKColorFilter>(SkiaApi.sk_colorfilter_new_gamma(gamma));
}
public static SKColorFilter CreateTable(byte[] table)
{
if (table == null)

Просмотреть файл

@ -56,7 +56,10 @@ namespace SkiaSharp
public static SKDocument CreateXps (string path, float dpi = DefaultRasterDpi)
{
return GetObject<SKDocument> (SkiaApi.sk_document_create_xps_from_filename (path, dpi));
var stream = new SKFileWStream (path);
var doc = CreateXps (stream, dpi);
doc.TakeOwnership (stream);
return doc;
}
public static SKDocument CreateXps (SKWStream stream, float dpi = DefaultRasterDpi)

Просмотреть файл

@ -116,24 +116,6 @@ namespace SkiaSharp
}
}
public bool UnderlineText {
get {
return SkiaApi.sk_paint_is_underline_text (Handle);
}
set {
SkiaApi.sk_paint_set_underline_text (Handle, value);
}
}
public bool StrikeThruText {
get {
return SkiaApi.sk_paint_is_strikethru_text (Handle);
}
set {
SkiaApi.sk_paint_set_strikethru_text (Handle, value);
}
}
public bool FakeBoldText {
get {
return SkiaApi.sk_paint_is_fake_bold_text (Handle);

Просмотреть файл

@ -191,8 +191,6 @@ namespace SkiaSharp
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static void sk_canvas_draw_point(sk_canvas_t t, float x, float y, sk_paint_t paint);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static void sk_canvas_draw_point_color(sk_canvas_t t, float x, float y, SKColor color);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static void sk_canvas_draw_line(sk_canvas_t t, float x0, float y0, float x1, float y1, sk_paint_t paint);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
@ -238,10 +236,10 @@ namespace SkiaSharp
public extern static void sk_canvas_clip_region(sk_canvas_t t, sk_region_t region, SKClipOperation op);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
[return: MarshalAs(UnmanagedType.I1)]
public extern static bool sk_canvas_get_clip_device_bounds(sk_canvas_t t, ref SKRectI cbounds);
public extern static bool sk_canvas_get_device_clip_bounds(sk_canvas_t t, out SKRectI cbounds);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
[return: MarshalAs(UnmanagedType.I1)]
public extern static bool sk_canvas_get_clip_bounds(sk_canvas_t t, ref SKRect cbounds);
public extern static bool sk_canvas_get_local_clip_bounds(sk_canvas_t t, out SKRect cbounds);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_canvas_t sk_canvas_new_from_bitmap(sk_bitmap_t bitmap);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
@ -414,16 +412,6 @@ namespace SkiaSharp
public extern static void sk_paint_set_hinting(sk_paint_t cpaint, SKPaintHinting hintingLevel);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
[return: MarshalAs(UnmanagedType.I1)]
public extern static bool sk_paint_is_underline_text(sk_paint_t cpaint);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static void sk_paint_set_underline_text(sk_paint_t cpaint, bool underlineText);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
[return: MarshalAs(UnmanagedType.I1)]
public extern static bool sk_paint_is_strikethru_text(sk_paint_t cpaint);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static void sk_paint_set_strikethru_text(sk_paint_t cpaint, bool strikeThruText);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
[return: MarshalAs(UnmanagedType.I1)]
public extern static bool sk_paint_is_fake_bold_text(sk_paint_t cpaint);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static void sk_paint_set_fake_bold_text(sk_paint_t cpaint, bool fakeBoldText);
@ -785,14 +773,10 @@ namespace SkiaSharp
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_colorfilter_t sk_colorfilter_new_compose(sk_colorfilter_t outer, sk_colorfilter_t inner);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_colorfilter_t sk_colorfilter_new_color_cube(sk_data_t cubeData, int cubeDimension);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_colorfilter_t sk_colorfilter_new_color_matrix(float[] array/*[20]*/);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_colorfilter_t sk_colorfilter_new_luma_color();
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_colorfilter_t sk_colorfilter_new_gamma(float gamma);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_colorfilter_t sk_colorfilter_new_table(byte[] table/*[256]*/);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_colorfilter_t sk_colorfilter_new_table_argb(byte[] tableA/*[256]*/, byte[] tableR/*[256]*/, byte[] tableG/*[256]*/, byte[] tableB/*[256]*/);
@ -1138,8 +1122,6 @@ namespace SkiaSharp
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_document_t sk_document_create_xps_from_stream(sk_wstream_t stream, float dpi);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_document_t sk_document_create_xps_from_filename([MarshalAs(UnmanagedType.LPStr)] string path, float dpi);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_canvas_t sk_document_begin_page(sk_document_t document, float width, float height, ref SKRect content);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_canvas_t sk_document_begin_page(sk_document_t document, float width, float height, IntPtr content);

Просмотреть файл

@ -347,7 +347,7 @@ Task ("externals-osx")
" is_official_build=true skia_enable_tools=false" +
" target_os=\"mac\" target_cpu=\"" + skiaArch + "\"" +
" skia_use_icu=false skia_use_sfntly=false" +
" extra_cflags=[ \"-DSKIA_C_DLL\", \"-ffunction-sections\", \"-fdata-sections\", \"-mmacosx-version-min=10.9\" ]" +
" extra_cflags=[ \"-DSKIA_C_DLL\", \"-mmacosx-version-min=10.9\" ]" +
" extra_ldflags=[ \"-Wl,macosx_version_min=10.9\" ]" +
"'",
WorkingDirectory = SKIA_PATH.FullPath,
@ -462,7 +462,7 @@ Task ("externals-ios")
" is_official_build=true skia_enable_tools=false" +
" target_os=\"ios\" target_cpu=\"" + skiaArch + "\"" +
" skia_use_icu=false skia_use_sfntly=false" +
" extra_cflags=[ \"-DSKIA_C_DLL\", \"-ffunction-sections\", \"-fdata-sections\", \"-mios-version-min=8.0\" " + specifics + " ]" +
" extra_cflags=[ \"-DSKIA_C_DLL\", \"-mios-version-min=8.0\" " + specifics + " ]" +
" extra_ldflags=[ \"-Wl,ios_version_min=8.0\" ]" +
"'",
WorkingDirectory = SKIA_PATH.FullPath,
@ -676,7 +676,7 @@ Task ("externals-android")
" is_official_build=true skia_enable_tools=false" +
" target_os=\"android\" target_cpu=\"" + skiaArch + "\"" +
" skia_use_icu=false skia_use_sfntly=false" +
" extra_cflags=[ \"-DSKIA_C_DLL\", \"-ffunction-sections\", \"-fdata-sections\" ]" +
" extra_cflags=[ \"-DSKIA_C_DLL\" ]" +
" ndk=\"" + ANDROID_NDK_HOME + "\"" +
" ndk_api=" + (skiaArch == "x64" || skiaArch == "arm64" ? 21 : 9) +
"'",
@ -747,7 +747,7 @@ Task ("externals-linux")
" target_os=\"linux\" target_cpu=\"" + arch + "\"" +
" skia_use_icu=false skia_use_sfntly=false skia_use_system_freetype2=false" +
" skia_enable_gpu=" + (SUPPORT_GPU ? "true" : "false") +
" extra_cflags=[ \"-DSKIA_C_DLL\", \"-ffunction-sections\", \"-fdata-sections\" ]" +
" extra_cflags=[ \"-DSKIA_C_DLL\" ]" +
" extra_ldflags=[ ]" +
"'",
WorkingDirectory = SKIA_PATH.FullPath,

2
externals/skia поставляемый

@ -1 +1 @@
Subproject commit 799209411ee741b4a2c90bca87de8448e3965285
Subproject commit 4246db5b08dc89e922c8d121a8fdfbd21c3af8e5

Просмотреть файл

@ -16,6 +16,9 @@ LOCAL_LDFLAGS := -s -Wl,--gc-sections
LOCAL_MODULE := SkiaSharp
LOCAL_C_INCLUDES := ../../externals/skia/src/c \
../../externals/skia/src/core \
../../externals/skia/src/xml \
../../externals/skia/include/private \
../../externals/skia/include/c \
../../externals/skia/include/core \
../../externals/skia/include/codec \

Просмотреть файл

@ -312,6 +312,9 @@
GCC_ENABLE_CPP_RTTI = NO;
HEADER_SEARCH_PATHS = (
../../externals/skia/src/c,
../../externals/skia/src/core,
../../externals/skia/src/xml,
../../externals/skia/include/private,
../../externals/skia/include/c,
../../externals/skia/include/core,
../../externals/skia/include/codec,
@ -349,6 +352,9 @@
GCC_ENABLE_CPP_RTTI = NO;
HEADER_SEARCH_PATHS = (
../../externals/skia/src/c,
../../externals/skia/src/core,
../../externals/skia/src/xml,
../../externals/skia/include/private,
../../externals/skia/include/c,
../../externals/skia/include/core,
../../externals/skia/include/codec,

Просмотреть файл

@ -23,6 +23,9 @@ library_dirs = \
../../externals/skia/out/linux/${ARCH}
include_dirs = \
../../externals/skia/src/c \
../../externals/skia/src/core \
../../externals/skia/src/xml \
../../externals/skia/include/private \
../../externals/skia/include/c \
../../externals/skia/include/core \
../../externals/skia/include/codec \

Просмотреть файл

@ -276,6 +276,9 @@
GCC_ENABLE_CPP_RTTI = NO;
HEADER_SEARCH_PATHS = (
../../externals/skia/src/c,
../../externals/skia/src/core,
../../externals/skia/src/xml,
../../externals/skia/include/private,
../../externals/skia/include/c,
../../externals/skia/include/core,
../../externals/skia/include/codec,
@ -305,6 +308,9 @@
GCC_ENABLE_CPP_RTTI = NO;
HEADER_SEARCH_PATHS = (
../../externals/skia/src/c,
../../externals/skia/src/core,
../../externals/skia/src/xml,
../../externals/skia/include/private,
../../externals/skia/include/c,
../../externals/skia/include/core,
../../externals/skia/include/codec,

Просмотреть файл

@ -307,6 +307,9 @@
GCC_ENABLE_CPP_RTTI = NO;
HEADER_SEARCH_PATHS = (
../../externals/skia/src/c,
../../externals/skia/src/core,
../../externals/skia/src/xml,
../../externals/skia/include/private,
../../externals/skia/include/c,
../../externals/skia/include/core,
../../externals/skia/include/codec,
@ -345,6 +348,9 @@
GCC_ENABLE_CPP_RTTI = NO;
HEADER_SEARCH_PATHS = (
../../externals/skia/src/c,
../../externals/skia/src/core,
../../externals/skia/src/xml,
../../externals/skia/include/private,
../../externals/skia/include/c,
../../externals/skia/include/core,
../../externals/skia/include/codec,

Просмотреть файл

@ -143,7 +143,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -164,7 +164,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -183,7 +183,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -205,7 +205,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -227,7 +227,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -249,7 +249,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>

Просмотреть файл

@ -94,7 +94,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -130,7 +130,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -151,7 +151,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\externals\skia\include\c;..\..\externals\skia\include\private;..\..\externals\skia\include\codec;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\gpu;..\..\externals\skia\include\images;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\xml;..\..\externals\skia\src\c;..\..\externals\skia\src\xml;..\..\externals\skia\src\core;..\..\externals\skia\src\gpu;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\svg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>