From 8b3c815ae3e976baf3ad0e8f776b34be74d09a02 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 15 Sep 2016 03:14:35 +0200 Subject: [PATCH] Updated the project files to the new skia location and split the cake script --- .gitignore | 2 - build.cake | 777 +----------------- cake/BuildExternals.cake | 444 ++++++++++ cake/TransformToTvOS.cake | 8 + cake/TransformToUWP.cake | 88 ++ cake/Utils.cake | 33 + cake/UtilsMSBuild.cake | 110 +++ cake/UtilsManaged.cake | 67 ++ cake/UtilsNative.cake | 48 ++ externals/.gitignore | 1 + externals/depot_tools | 2 +- externals/keys/mono.pub => mono.pub | Bin externals/keys/mono.snk => mono.snk | Bin .../libSkiaSharp_android/jni/SkiaSharp.mk | 20 +- .../libSkiaSharp_android/jni/skia_prebuilt.mk | 10 +- .../libSkiaSharp.xcodeproj/project.pbxproj | 80 +- .../libSkiaSharp.xcodeproj/project.pbxproj | 84 +- .../libSkiaSharp.xcodeproj/project.pbxproj | 80 +- .../libSkiaSharp_uwp/libSkiaSharp.vcxproj | 85 +- .../libSkiaSharp_uwp/libSkiaSharp_ARM.sln | 68 +- .../libSkiaSharp_uwp/libSkiaSharp_x64.sln | 76 +- .../libSkiaSharp_uwp/libSkiaSharp_x86.sln | 76 +- .../libSkiaSharp_windows/libSkiaSharp.vcxproj | 93 ++- .../libSkiaSharp_windows/libSkiaSharp_x64.sln | 80 +- .../libSkiaSharp_windows/libSkiaSharp_x86.sln | 80 +- .../SkiaSharp.Views.Interop.UWP.vcxproj | 41 +- 26 files changed, 1236 insertions(+), 1217 deletions(-) create mode 100644 cake/BuildExternals.cake create mode 100644 cake/TransformToTvOS.cake create mode 100644 cake/TransformToUWP.cake create mode 100644 cake/Utils.cake create mode 100644 cake/UtilsMSBuild.cake create mode 100644 cake/UtilsManaged.cake create mode 100644 cake/UtilsNative.cake create mode 100644 externals/.gitignore rename externals/keys/mono.pub => mono.pub (100%) rename externals/keys/mono.snk => mono.snk (100%) diff --git a/.gitignore b/.gitignore index 2e1b8d760..f5f3065af 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,6 @@ binding/SkiaSharp.Portable/SkiaPortable.cs docs/SkiaSharp.tree docs/SkiaSharp.zip *.VC.db -# the ANGLE externals folder -angle/ # User-specific files *.suo diff --git a/build.cake b/build.cake index 213ff3a2d..43ff82d0f 100644 --- a/build.cake +++ b/build.cake @@ -2,6 +2,8 @@ #addin "Cake.XCode" #addin "Cake.FileHelpers" +#load "cake/Utils.cake" + using System.Text.RegularExpressions; using System.Xml; using System.Xml.Linq; @@ -9,315 +11,24 @@ using System.Xml.Linq; var TARGET = Argument ("t", Argument ("target", Argument ("Target", "Default"))); var NuGetSources = new [] { MakeAbsolute (Directory ("./output")).FullPath, "https://api.nuget.org/v3/index.json" }; -var NugetToolPath = GetToolPath ("../nuget.exe"); -var XamarinComponentToolPath = GetToolPath ("../xamarin-component.exe"); -var CakeToolPath = GetToolPath ("Cake.exe"); -var NUnitConsoleToolPath = GetToolPath ("../NUnit.Console/tools/nunit3-console.exe"); -var GenApiToolPath = GetToolPath ("../genapi.exe"); -var MDocPath = GetToolPath ("../mdoc/mdoc.exe"); +var NugetToolPath = GetToolPath ("nuget.exe"); +var XamarinComponentToolPath = GetToolPath ("xamarin-component.exe"); +var CakeToolPath = GetToolPath ("Cake/Cake.exe"); +var NUnitConsoleToolPath = GetToolPath ("NUnit.Console/tools/nunit3-console.exe"); +var GenApiToolPath = GetToolPath ("genapi.exe"); +var MDocPath = GetToolPath ("mdoc/mdoc.exe"); DirectoryPath ROOT_PATH = MakeAbsolute(Directory(".")); -DirectoryPath DEPOT_PATH = MakeAbsolute(ROOT_PATH.Combine("depot_tools")); -DirectoryPath SKIA_PATH = MakeAbsolute(ROOT_PATH.Combine("skia")); +DirectoryPath DEPOT_PATH = MakeAbsolute(ROOT_PATH.Combine("externals/depot_tools")); +DirectoryPath SKIA_PATH = MakeAbsolute(ROOT_PATH.Combine("externals/skia")); +DirectoryPath ANGLE_PATH = MakeAbsolute(ROOT_PATH.Combine("externals/angle")); -//////////////////////////////////////////////////////////////////////////////////////////////////// -// TOOLS & FUNCTIONS - the bits to make it all work -//////////////////////////////////////////////////////////////////////////////////////////////////// - -var SetEnvironmentVariable = new Action ((name, value) => { - Information ("Setting Environment Variable {0} to {1}", name, value); - Environment.SetEnvironmentVariable (name, value, EnvironmentVariableTarget.Process); -}); -var AppendEnvironmentVariable = new Action ((name, value) => { - var old = EnvironmentVariable (name); - var sep = IsRunningOnWindows () ? ';' : ':'; - - if (!old.ToUpper ().Split (sep).Contains (value.ToUpper ())) { - Information ("Adding {0} to Environment Variable {1}", value, name); - value += sep + old; - SetEnvironmentVariable (name, value); - } -}); -void ListEnvironmentVariables () -{ - Information ("Environment Variables:"); - foreach (var envVar in EnvironmentVariables ()) { - Information ("\tKey: {0}\tValue: \"{1}\"", envVar.Key, envVar.Value); - } -} - -FilePath GetToolPath (FilePath toolPath) -{ - var appRoot = Context.Environment.GetApplicationRoot (); - var appRootExe = appRoot.CombineWithFilePath (toolPath); - if (FileExists (appRootExe)) - return appRootExe; - throw new FileNotFoundException ("Unable to find tool: " + appRootExe); -} - -var RunNuGetRestore = new Action ((solution) => -{ - NuGetRestore (solution, new NuGetRestoreSettings { - ToolPath = NugetToolPath, - Source = NuGetSources, - Verbosity = NuGetVerbosity.Detailed - }); -}); - -var RunGyp = new Action ((defines, generators) => -{ - SetEnvironmentVariable ("GYP_GENERATORS", generators); - SetEnvironmentVariable ("GYP_DEFINES", defines); - - Information ("Running 'sync-and-gyp'..."); - Information ("\tGYP_GENERATORS = " + EnvironmentVariable ("GYP_GENERATORS")); - Information ("\tGYP_DEFINES = " + EnvironmentVariable ("GYP_DEFINES")); - - var result = StartProcess ("python", new ProcessSettings { - Arguments = SKIA_PATH.CombineWithFilePath("bin/sync-and-gyp").FullPath, - WorkingDirectory = SKIA_PATH.FullPath, - }); - if (result != 0) { - throw new Exception ("sync-and-gyp failed with error: " + result); - } -}); - -var RunInstallNameTool = new Action ((directory, oldName, newName, library) => -{ - if (!IsRunningOnUnix ()) { - throw new InvalidOperationException ("install_name_tool is only available on Unix."); - } - - StartProcess ("install_name_tool", new ProcessSettings { - Arguments = string.Format("-change {0} {1} \"{2}\"", oldName, newName, library), - WorkingDirectory = directory, - }); -}); - -var RunLipo = new Action ((directory, output, inputs) => -{ - if (!IsRunningOnUnix ()) { - throw new InvalidOperationException ("lipo is only available on Unix."); - } - - var dir = directory.CombineWithFilePath (output).GetDirectory (); - if (!DirectoryExists (dir)) { - CreateDirectory (dir); - } - - var inputString = string.Join(" ", inputs.Select (i => string.Format ("\"{0}\"", i))); - StartProcess ("lipo", new ProcessSettings { - Arguments = string.Format("-create -output \"{0}\" {1}", output, inputString), - WorkingDirectory = directory, - }); -}); - -var PackageNuGet = new Action ((nuspecPath, outputPath) => -{ - if (!DirectoryExists (outputPath)) { - CreateDirectory (outputPath); - } - - NuGetPack (nuspecPath, new NuGetPackSettings { - Verbosity = NuGetVerbosity.Detailed, - OutputDirectory = outputPath, - BasePath = "./", - ToolPath = NugetToolPath - }); -}); - -var RunTests = new Action ((testAssembly) => -{ - var dir = testAssembly.GetDirectory (); - var result = StartProcess (NUnitConsoleToolPath, new ProcessSettings { - Arguments = string.Format ("\"{0}\" --work=\"{1}\"", testAssembly, dir), - }); - - if (result != 0) { - throw new Exception ("NUnit test failed with error: " + result); - } -}); - -var RunMdocUpdate = new Action ((assembly, docsRoot) => -{ - StartProcess (MDocPath, new ProcessSettings { - Arguments = string.Format ("update --delete --out=\"{0}\" \"{1}\"", docsRoot, assembly), - }); -}); - -var RunMdocMSXml = new Action ((docsRoot, output) => -{ - StartProcess (MDocPath, new ProcessSettings { - Arguments = string.Format ("export-msxdoc --out=\"{0}\" \"{1}\"", output, docsRoot), - }); -}); - -var RunMdocAssemble = new Action ((docsRoot, output) => -{ - StartProcess (MDocPath, new ProcessSettings { - Arguments = string.Format ("assemble --out=\"{0}\" \"{1}\"", output, docsRoot), - }); -}); - -var ProcessSolutionProjects = new Action> ((solutionFilePath, process) => { - var solutionFile = MakeAbsolute (solutionFilePath).FullPath; - foreach (var line in FileReadLines (solutionFile)) { - var match = Regex.Match (line, @"Project\(""(?.*)""\) = ""(?.*)"", ""(?.*)"", "".*"""); - if (match.Success && match.Groups ["type"].Value == "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") { - var path = match.Groups["path"].Value; - var projectFilePath = MakeAbsolute (solutionFilePath.GetDirectory ().CombineWithFilePath (path)); - Information ("Processing project file: " + projectFilePath); - process (match.Groups["name"].Value, projectFilePath); - } - } -}); - -var MSBuildNS = (XNamespace) "http://schemas.microsoft.com/developer/msbuild/2003"; - -var SetXValue = new Action ((root, element, value) => { - var node = root.Element (MSBuildNS + element); - if (node == null) - root.Add (new XElement (MSBuildNS + element, value)); - else - node.Value = value; -}); -var AddXValue = new Action ((root, element, value) => { - var node = root.Element (MSBuildNS + element); - if (node == null) - root.Add (new XElement (MSBuildNS + element, value)); - else if (!node.Value.Contains (value)) - node.Value += value; -}); -var RemoveXValue = new Action ((root, element, value) => { - var node = root.Element (MSBuildNS + element); - if (node != null) - node.Value = node.Value.Replace (value, string.Empty); -}); -var SetXValues = new Action ((root, parents, element, value) => { - IEnumerable nodes = new [] { root }; - foreach (var p in parents) { - nodes = nodes.Elements (MSBuildNS + p); - } - foreach (var n in nodes) { - SetXValue (n, element, value); - } -}); -var AddXValues = new Action ((root, parents, element, value) => { - IEnumerable nodes = new [] { root }; - foreach (var p in parents) { - nodes = nodes.Elements (MSBuildNS + p); - } - foreach (var n in nodes) { - AddXValue (n, element, value); - } -}); -var RemoveXValues = new Action ((root, parents, element, value) => { - IEnumerable nodes = new [] { root }; - foreach (var p in parents) { - nodes = nodes.Elements (MSBuildNS + p); - } - foreach (var n in nodes) { - RemoveXValue (n, element, value); - } -}); -var RemoveFileReference = new Action ((root, filename) => { - var element = root - .Elements (MSBuildNS + "ItemGroup") - .Elements (MSBuildNS + "ClCompile") - .Where (e => e.Attribute ("Include") != null) - .Where (e => e.Attribute ("Include").Value.Contains (filename)) - .FirstOrDefault (); - if (element != null) { - element.Remove (); - } -}); -var AddFileReference = new Action ((root, filename) => { - var element = root - .Elements (MSBuildNS + "ItemGroup") - .Elements (MSBuildNS + "ClCompile") - .Where (e => e.Attribute ("Include") != null) - .Where (e => e.Attribute ("Include").Value.Contains (filename)) - .FirstOrDefault (); - if (element == null) { - root.Elements (MSBuildNS + "ItemGroup") - .Elements (MSBuildNS + "ClCompile") - .Last () - .Parent - .Add (new XElement (MSBuildNS + "ClCompile", new XAttribute ("Include", filename))); - } -}); - -// find a better place for this / or fix the path issue -var VisualStudioPathFixup = new Action (() => { - var props = SKIA_PATH.CombineWithFilePath ("out/gyp/libjpeg-turbo.props").FullPath; - var xdoc = XDocument.Load (props); - var temp = xdoc.Root - .Elements (MSBuildNS + "ItemDefinitionGroup") - .Elements (MSBuildNS + "assemble") - .Elements (MSBuildNS + "CommandLineTemplate") - .Single (); - var newInclude = SKIA_PATH.Combine ("third_party/externals/libjpeg-turbo/win/").FullPath; - if (!temp.Value.Contains (newInclude)) { - temp.Value += " \"-I" + newInclude + "\""; - xdoc.Save (props); - } -}); - -var InjectCompatibilityExternals = new Action ((inject) => { - // some methods don't yet exist, so we must add the compat layer to them. - // we need this as we can't modify the third party files - // all we do is insert our header before all the others - var compatHeader = "native-builds/src/WinRTCompat.h"; - var compatSource = "native-builds/src/WinRTCompat.c"; - var files = new Dictionary { - { "skia/third_party/externals/dng_sdk/source/dng_string.cpp", "#if qWinOS" }, - { "skia/third_party/externals/dng_sdk/source/dng_utils.cpp", "#if qWinOS" }, - { "skia/third_party/externals/dng_sdk/source/dng_pthread.cpp", "#if qWinOS" }, - { "skia/third_party/externals/zlib/deflate.c", "#include " }, - { "skia/third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c", "#define JPEG_INTERNALS" }, - { "skia/third_party/externals/libjpeg-turbo/simd/jsimd_i386.c", "#define JPEG_INTERNALS" }, - { "skia/third_party/externals/libjpeg-turbo/simd/jsimd_arm.c", "#define JPEG_INTERNALS" }, - { "skia/third_party/externals/libjpeg-turbo/simd/jsimd_arm64.c", "#define JPEG_INTERNALS" }, - }; - foreach (var filePair in files) { - var file = filePair.Key; - var root = string.Join ("/", file.GetDirectory().Segments.Select (x => "..")); - var include = "#include \"" + root + "/" + compatHeader + "\""; - - var contents = FileReadLines (file).ToList (); - var index = contents.IndexOf (include); - if (index == -1 && inject) { - if (string.IsNullOrEmpty (filePair.Value)) { - contents.Insert (0, include); - } else { - contents.Insert (contents.IndexOf (filePair.Value), include); - } - FileWriteLines (file, contents.ToArray ()); - } else if (index != -1 && !inject) { - int idx = 0; - if (string.IsNullOrEmpty (filePair.Value)) { - idx = 0; - } else { - idx = contents.IndexOf (filePair.Value) - 1; - } - if (contents [idx] == include) { - contents.RemoveAt (idx); - } - FileWriteLines (file, contents.ToArray ()); - } - } -}); - -var ClearSkiaSharpNuGetCache = new Action (() => { - // first we need to add our new nuget to the cache so we can restore - // we first need to delete the old stuff - DirectoryPath home = EnvironmentVariable ("USERPROFILE") ?? EnvironmentVariable ("HOME"); - var installedNuGet = home.Combine (".nuget").Combine ("packages").Combine ("SkiaSharp"); - if (DirectoryExists (installedNuGet)) { - Warning ("SkiaSharp nugets were installed at '{0}', removing...", installedNuGet); - CleanDirectory (installedNuGet); - } -}); +#load "cake/UtilsManaged.cake" +#load "cake/UtilsMSBuild.cake" +#load "cake/UtilsNative.cake" +#load "cake/TransformToTvOS.cake" +#load "cake/TransformToUWP.cake" +#load "cake/BuildExternals.cake" //////////////////////////////////////////////////////////////////////////////////////////////////// // EXTERNALS - the native C and C++ libraries @@ -330,431 +41,6 @@ Task ("externals") .Does (() => { }); -// this builds the native C and C++ externals -Task ("externals-native") - .IsDependentOn ("externals-uwp") - .IsDependentOn ("externals-windows") - .IsDependentOn ("externals-osx") - .IsDependentOn ("externals-ios") - .IsDependentOn ("externals-tvos") - .IsDependentOn ("externals-android") - .Does (() => -{ - // copy all the native files into the output - CopyDirectory ("./native-builds/lib/", "./output/native/"); - - // copy the non-embedded native files into the output - if (IsRunningOnWindows ()) { - if (!DirectoryExists ("./output/windows/x86")) CreateDirectory ("./output/windows/x86"); - if (!DirectoryExists ("./output/windows/x64")) CreateDirectory ("./output/windows/x64"); - CopyFileToDirectory ("./native-builds/lib/windows/x86/libSkiaSharp.dll", "./output/windows/x86/"); - CopyFileToDirectory ("./native-builds/lib/windows/x86/libSkiaSharp.pdb", "./output/windows/x86/"); - CopyFileToDirectory ("./native-builds/lib/windows/x64/libSkiaSharp.dll", "./output/windows/x64/"); - CopyFileToDirectory ("./native-builds/lib/windows/x64/libSkiaSharp.pdb", "./output/windows/x64/"); - if (!DirectoryExists ("./output/uwp/x86")) CreateDirectory ("./output/uwp/x86"); - if (!DirectoryExists ("./output/uwp/x64")) CreateDirectory ("./output/uwp/x64"); - if (!DirectoryExists ("./output/uwp/arm")) CreateDirectory ("./output/uwp/arm"); - CopyFileToDirectory ("./native-builds/lib/uwp/x86/libSkiaSharp.dll", "./output/uwp/x86/"); - CopyFileToDirectory ("./native-builds/lib/uwp/x86/libSkiaSharp.pdb", "./output/uwp/x86/"); - CopyFileToDirectory ("./native-builds/lib/uwp/x64/libSkiaSharp.dll", "./output/uwp/x64/"); - CopyFileToDirectory ("./native-builds/lib/uwp/x64/libSkiaSharp.pdb", "./output/uwp/x64/"); - CopyFileToDirectory ("./native-builds/lib/uwp/arm/libSkiaSharp.dll", "./output/uwp/arm/"); - CopyFileToDirectory ("./native-builds/lib/uwp/arm/libSkiaSharp.pdb", "./output/uwp/arm/"); - // the ANGLE externals - CopyFileToDirectory ("./angle/uwp/bin/UAP/ARM/libEGL.dll", "./output/uwp/arm/"); - CopyFileToDirectory ("./angle/uwp/bin/UAP/ARM/libGLESv2.dll", "./output/uwp/arm/"); - CopyFileToDirectory ("./angle/uwp/bin/UAP/Win32/libEGL.dll", "./output/uwp/x86/"); - CopyFileToDirectory ("./angle/uwp/bin/UAP/Win32/libGLESv2.dll", "./output/uwp/x86/"); - CopyFileToDirectory ("./angle/uwp/bin/UAP/x64/libEGL.dll", "./output/uwp/x64/"); - CopyFileToDirectory ("./angle/uwp/bin/UAP/x64/libGLESv2.dll", "./output/uwp/x64/"); - } - if (IsRunningOnUnix ()) { - if (!DirectoryExists ("./output/osx")) CreateDirectory ("./output/osx"); - if (!DirectoryExists ("./output/mac")) CreateDirectory ("./output/mac"); - CopyFileToDirectory ("./native-builds/lib/osx/libSkiaSharp.dylib", "./output/osx/"); - CopyFileToDirectory ("./native-builds/lib/osx/libSkiaSharp.dylib", "./output/mac/"); - } -}); -// this builds the managed PCL external -Task ("externals-genapi") - .Does (() => -{ - // build the dummy project - DotNetBuild ("binding/SkiaSharp.Generic.sln", c => { - c.Configuration = "Release"; - c.Properties ["Platform"] = new [] { "\"Any CPU\"" }; - }); - - // generate the PCL - FilePath input = "binding/SkiaSharp.Generic/bin/Release/SkiaSharp.dll"; - var libPath = "/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/,."; - StartProcess (GenApiToolPath, new ProcessSettings { - Arguments = string.Format("-libPath:{2} -out \"{0}\" \"{1}\"", input.GetFilename () + ".cs", input.GetFilename (), libPath), - WorkingDirectory = input.GetDirectory ().FullPath, - }); - CopyFile ("binding/SkiaSharp.Generic/bin/Release/SkiaSharp.dll.cs", "binding/SkiaSharp.Portable/SkiaPortable.cs"); -}); -// this builds the native C and C++ externals for Windows -Task ("externals-windows") - .WithCriteria (IsRunningOnWindows ()) - .WithCriteria ( - !FileExists ("native-builds/lib/windows/x86/libSkiaSharp.dll") || - !FileExists ("native-builds/lib/windows/x64/libSkiaSharp.dll")) - .Does (() => -{ - var buildArch = new Action ((platform, skiaArch, dir) => { - RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1", "ninja,msvs"); - VisualStudioPathFixup (); - DotNetBuild ("native-builds/libSkiaSharp_windows/libSkiaSharp_" + dir + ".sln", c => { - c.Configuration = "Release"; - c.Properties ["Platform"] = new [] { platform }; - }); - if (!DirectoryExists ("native-builds/lib/windows/" + dir)) CreateDirectory ("native-builds/lib/windows/" + dir); - CopyFileToDirectory ("native-builds/libSkiaSharp_windows/Release/libSkiaSharp.lib", "native-builds/lib/windows/" + dir); - CopyFileToDirectory ("native-builds/libSkiaSharp_windows/Release/libSkiaSharp.dll", "native-builds/lib/windows/" + dir); - CopyFileToDirectory ("native-builds/libSkiaSharp_windows/Release/libSkiaSharp.pdb", "native-builds/lib/windows/" + dir); - }); - - // set up the gyp environment variables - AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); - - buildArch ("Win32", "x86", "x86"); - buildArch ("x64", "x86_64", "x64"); -}); -// this builds the native C and C++ externals for Windows UWP -Task ("externals-uwp") - .IsDependentOn ("externals-angle-uwp") - .WithCriteria (IsRunningOnWindows ()) - .WithCriteria ( - !FileExists ("native-builds/lib/uwp/ARM/libSkiaSharp.dll") || - !FileExists ("native-builds/lib/uwp/x86/libSkiaSharp.dll") || - !FileExists ("native-builds/lib/uwp/x64/libSkiaSharp.dll")) - .Does (() => -{ - var convertDesktopToUWP = new Action ((projectFilePath, platform) => { - // - // TODO: the stuff in this block must be moved into the gyp files !! - // - - var projectFile = MakeAbsolute (projectFilePath).FullPath; - var xdoc = XDocument.Load (projectFile); - - var configType = xdoc.Root - .Elements (MSBuildNS + "PropertyGroup") - .Elements (MSBuildNS + "ConfigurationType") - .Select (e => e.Value) - .FirstOrDefault (); - if (configType != "StaticLibrary") { - // skip over "Utility" projects as they aren't actually - // library projects, but intermediate build steps. - return; - } else { - // special case for ARM, gyp does not yet have ARM, - // so it defaults to Win32 - // update and reload - if (platform.ToUpper () == "ARM") { - ReplaceTextInFiles (projectFile, "Win32", "ARM"); - xdoc = XDocument.Load (projectFile); - } - } - - var rootNamespace = xdoc.Root - .Elements (MSBuildNS + "PropertyGroup") - .Elements (MSBuildNS + "RootNamespace") - .Select (e => e.Value) - .FirstOrDefault (); - var globals = xdoc.Root - .Elements (MSBuildNS + "PropertyGroup") - .Where (e => e.Attribute ("Label") != null && e.Attribute ("Label").Value == "Globals") - .Single (); - - globals.Elements (MSBuildNS + "WindowsTargetPlatformVersion").Remove (); - SetXValue (globals, "Keyword", "StaticLibrary"); - SetXValue (globals, "AppContainerApplication", "true"); - SetXValue (globals, "ApplicationType", "Windows Store"); - SetXValue (globals, "WindowsTargetPlatformVersion", "10.0.10586.0"); - SetXValue (globals, "WindowsTargetPlatformMinVersion", "10.0.10240.0"); - SetXValue (globals, "ApplicationTypeRevision", "10.0"); - SetXValue (globals, "DefaultLanguage", "en-US"); - - var properties = xdoc.Root - .Elements (MSBuildNS + "PropertyGroup") - .Elements (MSBuildNS + "LinkIncremental") - .First () - .Parent; - SetXValue (properties, "GenerateManifest","false"); - SetXValue (properties, "IgnoreImportLibrary","false"); - - SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "CompileAsWinRT", "false"); - AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";SK_BUILD_FOR_WINRT;WINAPI_FAMILY=WINAPI_FAMILY_APP;"); - // if (platform.ToUpper () == "ARM") { - // AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";__ARM_NEON;__ARM_NEON__;"); - // } - AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "DisableSpecificWarnings", ";4146;4703;"); - SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "SubSystem", "Console"); - SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "IgnoreAllDefaultLibraries", "false"); - SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "GenerateWindowsMetadata", "false"); - - xdoc.Root - .Elements (MSBuildNS + "ItemDefinitionGroup") - .Elements (MSBuildNS + "Link") - .Elements (MSBuildNS + "AdditionalDependencies") - .Remove (); - - if (rootNamespace == "pdf") { - // remove sfntly as this is not supported for winrt - RemoveXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", "SK_SFNTLY_SUBSETTER=\"sample/chromium/font_subsetter.h\""); - } else if (rootNamespace == "ports") { - RemoveFileReference (xdoc.Root, "SkFontHost_win.cpp"); - AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";SK_HAS_DWRITE_1_H;SK_HAS_DWRITE_2_H;"); - } else if (rootNamespace == "skgpu" ) { - // GL is not available to WinRT - RemoveFileReference (xdoc.Root, "GrGLCreateNativeInterface_none.cpp"); - AddFileReference (xdoc.Root, @"..\..\src\gpu\gl\GrGLCreateNativeInterface_none.cpp"); - RemoveFileReference (xdoc.Root, "GrGLCreateNativeInterface_win.cpp"); - RemoveFileReference (xdoc.Root, "SkCreatePlatformGLContext_win.cpp"); - } else if (rootNamespace == "utils" ) { - // GL is not available to WinRT - RemoveFileReference (xdoc.Root, "SkWGL.h"); - RemoveFileReference (xdoc.Root, "SkWGL_win.cpp"); - AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";SK_HAS_DWRITE_1_H;SK_HAS_DWRITE_2_H;"); - } - - xdoc.Save (projectFile); - }); - - var buildArch = new Action ((platform, arch) => { - CleanDirectories ("native-builds/libSkiaSharp_uwp/" + arch); - CleanDirectories ("native-builds/libSkiaSharp_uwp/Release"); - CleanDirectories ("native-builds/libSkiaSharp_uwp/Generated Files"); - ProcessSolutionProjects ("native-builds/libSkiaSharp_uwp/libSkiaSharp_" + arch + ".sln", (projectName, projectPath) => { - if (projectName != "libSkiaSharp") - convertDesktopToUWP (projectPath, platform); - }); - InjectCompatibilityExternals (true); - VisualStudioPathFixup (); - DotNetBuild ("native-builds/libSkiaSharp_uwp/libSkiaSharp_" + arch + ".sln", c => { - c.Configuration = "Release"; - c.Properties ["Platform"] = new [] { platform }; - }); - if (!DirectoryExists ("native-builds/lib/uwp/" + arch)) CreateDirectory ("native-builds/lib/uwp/" + arch); - CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/Release/libSkiaSharp.lib", "native-builds/lib/uwp/" + arch); - CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/Release/libSkiaSharp.dll", "native-builds/lib/uwp/" + arch); - CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/Release/libSkiaSharp.pdb", "native-builds/lib/uwp/" + arch); - }); - - // set up the gyp environment variables - AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); - - RunGyp ("skia_arch_type='x86_64' skia_gpu=1", "ninja,msvs"); - buildArch ("x64", "x64"); - - RunGyp ("skia_arch_type='x86' skia_gpu=1", "ninja,msvs"); - buildArch ("Win32", "x86"); - - RunGyp ("skia_arch_type='arm' arm_version=7 arm_neon=0 skia_gpu=1", "ninja,msvs"); - buildArch ("ARM", "arm"); -}); -// this builds the native C and C++ externals for Mac OS X -Task ("externals-osx") - .WithCriteria (IsRunningOnUnix ()) - .WithCriteria ( - !FileExists ("native-builds/lib/osx/libSkiaSharp.dylib")) - .Does (() => -{ - var buildArch = new Action ((arch, skiaArch) => { - RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1 skia_osx_deployment_target=10.8", "ninja,xcode"); - - XCodeBuild (new XCodeBuildSettings { - Project = "native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj", - Target = "libSkiaSharp", - Sdk = "macosx", - Arch = arch, - Configuration = "Release", - }); - if (!DirectoryExists ("native-builds/lib/osx/" + arch)) { - CreateDirectory ("native-builds/lib/osx/" + arch); - } - CopyDirectory ("native-builds/libSkiaSharp_osx/build/Release/", "native-builds/lib/osx/" + arch); - RunInstallNameTool ("native-builds/lib/osx/" + arch, "lib/libSkiaSharp.dylib", "@loader_path/libSkiaSharp.dylib", "libSkiaSharp.dylib"); - }); - - // set up the gyp environment variables - AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); - - buildArch ("i386", "x86"); - buildArch ("x86_64", "x86_64"); - - // create the fat dylib - RunLipo ("native-builds/lib/osx/", "libSkiaSharp.dylib", new [] { - (FilePath) "i386/libSkiaSharp.dylib", - (FilePath) "x86_64/libSkiaSharp.dylib" - }); -}); -// this builds the native C and C++ externals for iOS -Task ("externals-ios") - .WithCriteria (IsRunningOnUnix ()) - .WithCriteria ( - !FileExists ("native-builds/lib/ios/libSkiaSharp.framework/libSkiaSharp")) - .Does (() => -{ - var buildArch = new Action ((sdk, arch) => { - XCodeBuild (new XCodeBuildSettings { - Project = "native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj", - Target = "libSkiaSharp", - Sdk = sdk, - Arch = arch, - Configuration = "Release", - }); - if (!DirectoryExists ("native-builds/lib/ios/" + arch)) { - CreateDirectory ("native-builds/lib/ios/" + arch); - } - CopyDirectory ("native-builds/libSkiaSharp_ios/build/Release-" + sdk, "native-builds/lib/ios/" + arch); - }); - - // set up the gyp environment variables - AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); - - RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0 skia_gpu=1 ios_sdk_version=8.0", "ninja,xcode"); - - buildArch ("iphonesimulator", "i386"); - buildArch ("iphonesimulator", "x86_64"); - buildArch ("iphoneos", "armv7"); - buildArch ("iphoneos", "armv7s"); - buildArch ("iphoneos", "arm64"); - - // create the fat framework - CopyDirectory ("native-builds/lib/ios/armv7/libSkiaSharp.framework/", "native-builds/lib/ios/libSkiaSharp.framework/"); - DeleteFile ("native-builds/lib/ios/libSkiaSharp.framework/libSkiaSharp"); - RunLipo ("native-builds/lib/ios/", "libSkiaSharp.framework/libSkiaSharp", new [] { - (FilePath) "i386/libSkiaSharp.framework/libSkiaSharp", - (FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp", - (FilePath) "armv7/libSkiaSharp.framework/libSkiaSharp", - (FilePath) "armv7s/libSkiaSharp.framework/libSkiaSharp", - (FilePath) "arm64/libSkiaSharp.framework/libSkiaSharp" - }); -}); -// this builds the native C and C++ externals for tvOS -Task ("externals-tvos") - .WithCriteria (IsRunningOnUnix ()) - .WithCriteria ( - !FileExists ("native-builds/lib/tvos/libSkiaSharp.framework/libSkiaSharp")) - .Does (() => -{ - var convertIOSToTVOS = new Action (() => { - var glob = "./skia/out/gyp/*.xcodeproj/project.pbxproj"; - ReplaceTextInFiles (glob, "SDKROOT = iphoneos;", "SDKROOT = appletvos;"); - ReplaceTextInFiles (glob, "IPHONEOS_DEPLOYMENT_TARGET", "TVOS_DEPLOYMENT_TARGET"); - ReplaceTextInFiles (glob, "TARGETED_DEVICE_FAMILY = \"1,2\";", "TARGETED_DEVICE_FAMILY = 3;"); - ReplaceTextInFiles (glob, "\"CODE_SIGN_IDENTITY[sdk=iphoneos*]\" = \"iPhone Developer\";", ""); - }); - - var buildArch = new Action ((sdk, arch) => { - XCodeBuild (new XCodeBuildSettings { - Project = "native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj", - Target = "libSkiaSharp", - Sdk = sdk, - Arch = arch, - Configuration = "Release", - }); - if (!DirectoryExists ("native-builds/lib/tvos/" + arch)) { - CreateDirectory ("native-builds/lib/tvos/" + arch); - } - CopyDirectory ("native-builds/libSkiaSharp_tvos/build/Release-" + sdk, "native-builds/lib/tvos/" + arch); - }); - - // set up the gyp environment variables - AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); - - RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0 skia_gpu=1 ios_sdk_version=9.0", "ninja,xcode"); - convertIOSToTVOS(); - - buildArch ("appletvsimulator", "x86_64"); - buildArch ("appletvos", "arm64"); - - // create the fat framework - CopyDirectory ("native-builds/lib/tvos/arm64/libSkiaSharp.framework/", "native-builds/lib/tvos/libSkiaSharp.framework/"); - DeleteFile ("native-builds/lib/tvos/libSkiaSharp.framework/libSkiaSharp"); - RunLipo ("native-builds/lib/tvos/", "libSkiaSharp.framework/libSkiaSharp", new [] { - (FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp", - (FilePath) "arm64/libSkiaSharp.framework/libSkiaSharp" - }); -}); -// this builds the native C and C++ externals for Android -Task ("externals-android") - .WithCriteria (IsRunningOnUnix ()) - .WithCriteria ( - !FileExists ("native-builds/lib/android/x86/libSkiaSharp.so") || - !FileExists ("native-builds/lib/android/x86_64/libSkiaSharp.so") || - !FileExists ("native-builds/lib/android/armeabi-v7a/libSkiaSharp.so") || - !FileExists ("native-builds/lib/android/arm64-v8a/libSkiaSharp.so")) - .Does (() => -{ - var ANDROID_HOME = EnvironmentVariable ("ANDROID_HOME") ?? EnvironmentVariable ("HOME") + "/Library/Developer/Xamarin/android-sdk-macosx"; - var ANDROID_SDK_ROOT = EnvironmentVariable ("ANDROID_SDK_ROOT") ?? ANDROID_HOME; - var ANDROID_NDK_HOME = EnvironmentVariable ("ANDROID_NDK_HOME") ?? EnvironmentVariable ("HOME") + "/Library/Developer/Xamarin/android-ndk"; - - var buildArch = new Action ((arch, folder) => { - StartProcess (SKIA_PATH.CombineWithFilePath ("platform_tools/android/bin/android_ninja").FullPath, new ProcessSettings { - Arguments = "-d " + arch + " skia_lib pdf sfntly icuuc", - WorkingDirectory = SKIA_PATH.FullPath, - }); - }); - - // set up the gyp environment variables - AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); - SetEnvironmentVariable ("GYP_DEFINES", ""); - SetEnvironmentVariable ("GYP_GENERATORS", ""); - SetEnvironmentVariable ("BUILDTYPE", "Release"); - SetEnvironmentVariable ("ANDROID_HOME", ANDROID_HOME); - SetEnvironmentVariable ("ANDROID_SDK_ROOT", ANDROID_SDK_ROOT); - SetEnvironmentVariable ("ANDROID_NDK_HOME", ANDROID_NDK_HOME); - - SetEnvironmentVariable ("GYP_DEFINES", "skia_gpu=1"); - buildArch ("x86", "x86"); - SetEnvironmentVariable ("GYP_DEFINES", "skia_gpu=1"); - buildArch ("x86_64", "x86_64"); - SetEnvironmentVariable ("GYP_DEFINES", "arm_neon=1 arm_version=7 skia_gpu=1"); - buildArch ("arm_v7_neon", "armeabi-v7a"); - SetEnvironmentVariable ("GYP_DEFINES", "arm_neon=0 arm_version=8 skia_gpu=1"); - buildArch ("arm64", "arm64-v8a"); - - var ndkbuild = MakeAbsolute (Directory (ANDROID_NDK_HOME)).CombineWithFilePath ("ndk-build").FullPath; - StartProcess (ndkbuild, new ProcessSettings { - Arguments = "", - WorkingDirectory = ROOT_PATH.Combine ("native-builds/libSkiaSharp_android").FullPath, - }); - - foreach (var folder in new [] { "x86", "x86_64", "armeabi-v7a", "arm64-v8a" }) { - if (!DirectoryExists ("native-builds/lib/android/" + folder)) { - CreateDirectory ("native-builds/lib/android/" + folder); - } - CopyFileToDirectory ("native-builds/libSkiaSharp_android/libs/" + folder + "/libSkiaSharp.so", "native-builds/lib/android/" + folder); - } -}); - -//////////////////////////////////////////////////////////////////////////////////////////////////// -// EXTERNALS DOWNLOAD - download any externals that are needed -//////////////////////////////////////////////////////////////////////////////////////////////////// - -Task ("externals-angle-uwp") - .WithCriteria (IsRunningOnWindows ()) - .WithCriteria (!FileExists ("./angle/uwp/ANGLE.WindowsStore.nuspec")) - .Does (() => -{ - var angleVersion = "2.1.10"; - var angleUrl = "https://www.nuget.org/api/v2/package/ANGLE.WindowsStore/" + angleVersion; - var angleRoot = (DirectoryPath)"./angle/uwp"; - var angleNupkg = angleRoot.CombineWithFilePath ("angle_" + angleVersion + ".nupkg"); - - if (!DirectoryExists (angleRoot)) { - CreateDirectory (angleRoot); - } else { - CleanDirectory (angleRoot); - } - DownloadFile (angleUrl, angleNupkg); - Unzip (angleNupkg, angleRoot); -}); //////////////////////////////////////////////////////////////////////////////////////////////////// // LIBS - the managed C# libraries @@ -1105,35 +391,6 @@ Task ("clean-managed").Does (() => if (DirectoryExists ("./output")) DeleteDirectory ("./output", true); }); -Task ("clean-externals").Does (() => -{ - // skia - CleanDirectories ("skia/out"); - CleanDirectories ("skia/xcodebuild"); - - // all - CleanDirectories ("native-builds/lib"); - // android - CleanDirectories ("native-builds/libSkiaSharp_android/obj"); - CleanDirectories ("native-builds/libSkiaSharp_android/libs"); - // ios - CleanDirectories ("native-builds/libSkiaSharp_ios/build"); - // tvos - CleanDirectories ("native-builds/libSkiaSharp_tvos/build"); - // osx - CleanDirectories ("native-builds/libSkiaSharp_osx/build"); - // windows - CleanDirectories ("native-builds/libSkiaSharp_windows/Release"); - CleanDirectories ("native-builds/libSkiaSharp_windows/x64/Release"); - // uwp - CleanDirectories ("native-builds/libSkiaSharp_uwp/Release"); - CleanDirectories ("native-builds/libSkiaSharp_uwp/x64/Release"); - CleanDirectories ("native-builds/libSkiaSharp_uwp/ARM/Release"); - CleanDirectories ("angle/uwp"); - - // remove compatibility - InjectCompatibilityExternals (false); -}); //////////////////////////////////////////////////////////////////////////////////////////////////// // DEFAULT - target for common development diff --git a/cake/BuildExternals.cake b/cake/BuildExternals.cake new file mode 100644 index 000000000..644fe373a --- /dev/null +++ b/cake/BuildExternals.cake @@ -0,0 +1,444 @@ + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// TOOLS & FUNCTIONS - the bits to make it all work +//////////////////////////////////////////////////////////////////////////////////////////////////// + +// find a better place for this / or fix the path issue +var VisualStudioPathFixup = new Action (() => { + var props = SKIA_PATH.CombineWithFilePath ("out/gyp/libjpeg-turbo.props").FullPath; + var xdoc = XDocument.Load (props); + var temp = xdoc.Root + .Elements (MSBuildNS + "ItemDefinitionGroup") + .Elements (MSBuildNS + "assemble") + .Elements (MSBuildNS + "CommandLineTemplate") + .Single (); + var newInclude = SKIA_PATH.Combine ("third_party/externals/libjpeg-turbo/win/").FullPath; + if (!temp.Value.Contains (newInclude)) { + temp.Value += " \"-I" + newInclude + "\""; + xdoc.Save (props); + } +}); + +var InjectCompatibilityExternals = new Action ((inject) => { + // some methods don't yet exist, so we must add the compat layer to them. + // we need this as we can't modify the third party files + // all we do is insert our header before all the others + var compatHeader = "native-builds/src/WinRTCompat.h"; + var compatSource = "native-builds/src/WinRTCompat.c"; + var files = new Dictionary { + { "externals/skia/third_party/externals/dng_sdk/source/dng_string.cpp", "#if qWinOS" }, + { "externals/skia/third_party/externals/dng_sdk/source/dng_utils.cpp", "#if qWinOS" }, + { "externals/skia/third_party/externals/dng_sdk/source/dng_pthread.cpp", "#if qWinOS" }, + { "externals/skia/third_party/externals/zlib/deflate.c", "#include " }, + { "externals/skia/third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c", "#define JPEG_INTERNALS" }, + { "externals/skia/third_party/externals/libjpeg-turbo/simd/jsimd_i386.c", "#define JPEG_INTERNALS" }, + { "externals/skia/third_party/externals/libjpeg-turbo/simd/jsimd_arm.c", "#define JPEG_INTERNALS" }, + { "externals/skia/third_party/externals/libjpeg-turbo/simd/jsimd_arm64.c", "#define JPEG_INTERNALS" }, + }; + foreach (var filePair in files) { + var file = filePair.Key; + + if (!FileExists (file)) + continue; + + var root = string.Join ("/", file.GetDirectory ().Segments.Select (x => "..")); + var include = "#include \"" + root + "/" + compatHeader + "\""; + + var contents = FileReadLines (file).ToList (); + var index = contents.IndexOf (include); + if (index == -1 && inject) { + if (string.IsNullOrEmpty (filePair.Value)) { + contents.Insert (0, include); + } else { + contents.Insert (contents.IndexOf (filePair.Value), include); + } + FileWriteLines (file, contents.ToArray ()); + } else if (index != -1 && !inject) { + int idx = 0; + if (string.IsNullOrEmpty (filePair.Value)) { + idx = 0; + } else { + idx = contents.IndexOf (filePair.Value) - 1; + } + if (contents [idx] == include) { + contents.RemoveAt (idx); + } + FileWriteLines (file, contents.ToArray ()); + } + } +}); + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// EXTERNALS - the native C and C++ libraries +//////////////////////////////////////////////////////////////////////////////////////////////////// + +// this builds the managed PCL external +Task ("externals-genapi") + .Does (() => +{ + // build the dummy project + DotNetBuild ("binding/SkiaSharp.Generic.sln", c => { + c.Configuration = "Release"; + c.Properties ["Platform"] = new [] { "\"Any CPU\"" }; + }); + + // generate the PCL + FilePath input = "binding/SkiaSharp.Generic/bin/Release/SkiaSharp.dll"; + var libPath = "/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/,."; + StartProcess (GenApiToolPath, new ProcessSettings { + Arguments = string.Format("-libPath:{2} -out \"{0}\" \"{1}\"", input.GetFilename () + ".cs", input.GetFilename (), libPath), + WorkingDirectory = input.GetDirectory ().FullPath, + }); + CopyFile ("binding/SkiaSharp.Generic/bin/Release/SkiaSharp.dll.cs", "binding/SkiaSharp.Portable/SkiaPortable.cs"); +}); + +// this builds the native C and C++ externals +Task ("externals-native") + .IsDependentOn ("externals-uwp") + .IsDependentOn ("externals-windows") + .IsDependentOn ("externals-osx") + .IsDependentOn ("externals-ios") + .IsDependentOn ("externals-tvos") + .IsDependentOn ("externals-android") + .Does (() => +{ + // copy all the native files into the output + CopyDirectory ("./native-builds/lib/", "./output/native/"); + + // copy the non-embedded native files into the output + if (IsRunningOnWindows ()) { + if (!DirectoryExists ("./output/windows/x86")) CreateDirectory ("./output/windows/x86"); + if (!DirectoryExists ("./output/windows/x64")) CreateDirectory ("./output/windows/x64"); + CopyFileToDirectory ("./native-builds/lib/windows/x86/libSkiaSharp.dll", "./output/windows/x86/"); + CopyFileToDirectory ("./native-builds/lib/windows/x86/libSkiaSharp.pdb", "./output/windows/x86/"); + CopyFileToDirectory ("./native-builds/lib/windows/x64/libSkiaSharp.dll", "./output/windows/x64/"); + CopyFileToDirectory ("./native-builds/lib/windows/x64/libSkiaSharp.pdb", "./output/windows/x64/"); + if (!DirectoryExists ("./output/uwp/x86")) CreateDirectory ("./output/uwp/x86"); + if (!DirectoryExists ("./output/uwp/x64")) CreateDirectory ("./output/uwp/x64"); + if (!DirectoryExists ("./output/uwp/arm")) CreateDirectory ("./output/uwp/arm"); + CopyFileToDirectory ("./native-builds/lib/uwp/x86/libSkiaSharp.dll", "./output/uwp/x86/"); + CopyFileToDirectory ("./native-builds/lib/uwp/x86/libSkiaSharp.pdb", "./output/uwp/x86/"); + CopyFileToDirectory ("./native-builds/lib/uwp/x64/libSkiaSharp.dll", "./output/uwp/x64/"); + CopyFileToDirectory ("./native-builds/lib/uwp/x64/libSkiaSharp.pdb", "./output/uwp/x64/"); + CopyFileToDirectory ("./native-builds/lib/uwp/arm/libSkiaSharp.dll", "./output/uwp/arm/"); + CopyFileToDirectory ("./native-builds/lib/uwp/arm/libSkiaSharp.pdb", "./output/uwp/arm/"); + // copy ANGLE externals + CopyFileToDirectory (ANGLE_PATH.CombineWithFilePath ("uwp/bin/UAP/ARM/libEGL.dll"), "./output/uwp/arm/"); + CopyFileToDirectory (ANGLE_PATH.CombineWithFilePath ("uwp/bin/UAP/ARM/libGLESv2.dll"), "./output/uwp/arm/"); + CopyFileToDirectory (ANGLE_PATH.CombineWithFilePath ("uwp/bin/UAP/Win32/libEGL.dll"), "./output/uwp/x86/"); + CopyFileToDirectory (ANGLE_PATH.CombineWithFilePath ("uwp/bin/UAP/Win32/libGLESv2.dll"), "./output/uwp/x86/"); + CopyFileToDirectory (ANGLE_PATH.CombineWithFilePath ("uwp/bin/UAP/x64/libEGL.dll"), "./output/uwp/x64/"); + CopyFileToDirectory (ANGLE_PATH.CombineWithFilePath ("uwp/bin/UAP/x64/libGLESv2.dll"), "./output/uwp/x64/"); + } + if (IsRunningOnUnix ()) { + if (!DirectoryExists ("./output/osx")) CreateDirectory ("./output/osx"); + if (!DirectoryExists ("./output/mac")) CreateDirectory ("./output/mac"); + CopyFileToDirectory ("./native-builds/lib/osx/libSkiaSharp.dylib", "./output/osx/"); + CopyFileToDirectory ("./native-builds/lib/osx/libSkiaSharp.dylib", "./output/mac/"); + } +}); + +// this builds the native C and C++ externals for Windows +Task ("externals-windows") + .WithCriteria (IsRunningOnWindows ()) + .WithCriteria ( + !FileExists ("native-builds/lib/windows/x86/libSkiaSharp.dll") || + !FileExists ("native-builds/lib/windows/x64/libSkiaSharp.dll")) + .Does (() => +{ + var buildArch = new Action ((platform, skiaArch, dir) => { + RunGyp ("skia_arch_type='" + skiaArch + "' skia_gpu=1", "msvs"); + ProcessSolutionProjects ("native-builds/libSkiaSharp_uwp/libSkiaSharp_" + dir + ".sln", (projectName, projectPath) => { + if (projectName != "libSkiaSharp") { + RedirectBuildOutputs (projectPath); + } + }); + VisualStudioPathFixup (); + DotNetBuild ("native-builds/libSkiaSharp_windows/libSkiaSharp_" + dir + ".sln", c => { + c.Configuration = "Release"; + c.Properties ["Platform"] = new [] { platform }; + }); + if (!DirectoryExists ("native-builds/lib/windows/" + dir)) CreateDirectory ("native-builds/lib/windows/" + dir); + CopyFileToDirectory ("native-builds/libSkiaSharp_windows/bin/" + platform + "/Release/libSkiaSharp.lib", "native-builds/lib/windows/" + dir); + CopyFileToDirectory ("native-builds/libSkiaSharp_windows/bin/" + platform + "/Release/libSkiaSharp.dll", "native-builds/lib/windows/" + dir); + CopyFileToDirectory ("native-builds/libSkiaSharp_windows/bin/" + platform + "/Release/libSkiaSharp.pdb", "native-builds/lib/windows/" + dir); + }); + + // set up the gyp environment variables + AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); + + buildArch ("Win32", "x86", "x86"); + buildArch ("x64", "x86_64", "x64"); +}); + +// this builds the native C and C++ externals for Windows UWP +Task ("externals-uwp") + .IsDependentOn ("externals-angle-uwp") + .WithCriteria (IsRunningOnWindows ()) + .WithCriteria ( + !FileExists ("native-builds/lib/uwp/ARM/libSkiaSharp.dll") || + !FileExists ("native-builds/lib/uwp/x86/libSkiaSharp.dll") || + !FileExists ("native-builds/lib/uwp/x64/libSkiaSharp.dll")) + .Does (() => +{ + var buildArch = new Action ((platform, arch) => { + ProcessSolutionProjects ("native-builds/libSkiaSharp_uwp/libSkiaSharp_" + arch + ".sln", (projectName, projectPath) => { + if (projectName != "libSkiaSharp") { + RedirectBuildOutputs (projectPath); + TransformToUWP (projectPath, platform); + } + }); + InjectCompatibilityExternals (true); + VisualStudioPathFixup (); + DotNetBuild ("native-builds/libSkiaSharp_uwp/libSkiaSharp_" + arch + ".sln", c => { + c.Configuration = "Release"; + c.Properties ["Platform"] = new [] { platform }; + }); + if (!DirectoryExists ("native-builds/lib/uwp/" + arch)) CreateDirectory ("native-builds/lib/uwp/" + arch); + CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/bin/" + platform + "/Release/libSkiaSharp.lib", "native-builds/lib/uwp/" + arch); + CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/bin/" + platform + "/Release/libSkiaSharp.dll", "native-builds/lib/uwp/" + arch); + CopyFileToDirectory ("native-builds/libSkiaSharp_uwp/bin/" + platform + "/Release/libSkiaSharp.pdb", "native-builds/lib/uwp/" + arch); + }); + + // set up the gyp environment variables + AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); + + RunGyp ("skia_arch_type='x86_64' skia_gpu=1", "msvs"); + buildArch ("x64", "x64"); + + RunGyp ("skia_arch_type='x86' skia_gpu=1", "msvs"); + buildArch ("Win32", "x86"); + + RunGyp ("skia_arch_type='arm' arm_version=7 arm_neon=0 skia_gpu=1", "msvs"); + buildArch ("ARM", "arm"); +}); + +// this builds the native C and C++ externals for Mac OS X +Task ("externals-osx") + .WithCriteria (IsRunningOnUnix ()) + .WithCriteria ( + !FileExists ("native-builds/lib/osx/libSkiaSharp.dylib")) + .Does (() => +{ + var buildArch = new Action ((arch, skiaArch) => { + 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", + Target = "libSkiaSharp", + Sdk = "macosx", + Arch = arch, + Configuration = "Release", + }); + if (!DirectoryExists ("native-builds/lib/osx/" + arch)) { + CreateDirectory ("native-builds/lib/osx/" + arch); + } + CopyDirectory ("native-builds/libSkiaSharp_osx/build/Release/", "native-builds/lib/osx/" + arch); + RunInstallNameTool ("native-builds/lib/osx/" + arch, "lib/libSkiaSharp.dylib", "@loader_path/libSkiaSharp.dylib", "libSkiaSharp.dylib"); + }); + + // set up the gyp environment variables + AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); + + buildArch ("i386", "x86"); + buildArch ("x86_64", "x86_64"); + + // create the fat dylib + RunLipo ("native-builds/lib/osx/", "libSkiaSharp.dylib", new [] { + (FilePath) "i386/libSkiaSharp.dylib", + (FilePath) "x86_64/libSkiaSharp.dylib" + }); +}); + +// this builds the native C and C++ externals for iOS +Task ("externals-ios") + .WithCriteria (IsRunningOnUnix ()) + .WithCriteria ( + !FileExists ("native-builds/lib/ios/libSkiaSharp.framework/libSkiaSharp")) + .Does (() => +{ + var buildArch = new Action ((sdk, arch) => { + XCodeBuild (new XCodeBuildSettings { + Project = "native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj", + Target = "libSkiaSharp", + Sdk = sdk, + Arch = arch, + Configuration = "Release", + }); + if (!DirectoryExists ("native-builds/lib/ios/" + arch)) { + CreateDirectory ("native-builds/lib/ios/" + arch); + } + CopyDirectory ("native-builds/libSkiaSharp_ios/build/Release-" + sdk, "native-builds/lib/ios/" + arch); + }); + + // set up the gyp environment variables + AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); + + RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0 skia_gpu=1 ios_sdk_version=8.0", "xcode"); + + buildArch ("iphonesimulator", "i386"); + buildArch ("iphonesimulator", "x86_64"); + buildArch ("iphoneos", "armv7"); + buildArch ("iphoneos", "armv7s"); + buildArch ("iphoneos", "arm64"); + + // create the fat framework + CopyDirectory ("native-builds/lib/ios/armv7/libSkiaSharp.framework/", "native-builds/lib/ios/libSkiaSharp.framework/"); + DeleteFile ("native-builds/lib/ios/libSkiaSharp.framework/libSkiaSharp"); + RunLipo ("native-builds/lib/ios/", "libSkiaSharp.framework/libSkiaSharp", new [] { + (FilePath) "i386/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "armv7/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "armv7s/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "arm64/libSkiaSharp.framework/libSkiaSharp" + }); +}); + +// this builds the native C and C++ externals for tvOS +Task ("externals-tvos") + .WithCriteria (IsRunningOnUnix ()) + .WithCriteria ( + !FileExists ("native-builds/lib/tvos/libSkiaSharp.framework/libSkiaSharp")) + .Does (() => +{ + var buildArch = new Action ((sdk, arch) => { + XCodeBuild (new XCodeBuildSettings { + Project = "native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj", + Target = "libSkiaSharp", + Sdk = sdk, + Arch = arch, + Configuration = "Release", + }); + if (!DirectoryExists ("native-builds/lib/tvos/" + arch)) { + CreateDirectory ("native-builds/lib/tvos/" + arch); + } + CopyDirectory ("native-builds/libSkiaSharp_tvos/build/Release-" + sdk, "native-builds/lib/tvos/" + arch); + }); + + // set up the gyp environment variables + AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); + + RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0 skia_gpu=1 ios_sdk_version=9.0", "xcode"); + TransformToTvOS ("./externals/skia/out/gyp"); + + buildArch ("appletvsimulator", "x86_64"); + buildArch ("appletvos", "arm64"); + + // create the fat framework + CopyDirectory ("native-builds/lib/tvos/arm64/libSkiaSharp.framework/", "native-builds/lib/tvos/libSkiaSharp.framework/"); + DeleteFile ("native-builds/lib/tvos/libSkiaSharp.framework/libSkiaSharp"); + RunLipo ("native-builds/lib/tvos/", "libSkiaSharp.framework/libSkiaSharp", new [] { + (FilePath) "x86_64/libSkiaSharp.framework/libSkiaSharp", + (FilePath) "arm64/libSkiaSharp.framework/libSkiaSharp" + }); +}); + +// this builds the native C and C++ externals for Android +Task ("externals-android") + .WithCriteria (IsRunningOnUnix ()) + .WithCriteria ( + !FileExists ("native-builds/lib/android/x86/libSkiaSharp.so") || + !FileExists ("native-builds/lib/android/x86_64/libSkiaSharp.so") || + !FileExists ("native-builds/lib/android/armeabi-v7a/libSkiaSharp.so") || + !FileExists ("native-builds/lib/android/arm64-v8a/libSkiaSharp.so")) + .Does (() => +{ + var ANDROID_HOME = EnvironmentVariable ("ANDROID_HOME") ?? EnvironmentVariable ("HOME") + "/Library/Developer/Xamarin/android-sdk-macosx"; + var ANDROID_SDK_ROOT = EnvironmentVariable ("ANDROID_SDK_ROOT") ?? ANDROID_HOME; + var ANDROID_NDK_HOME = EnvironmentVariable ("ANDROID_NDK_HOME") ?? EnvironmentVariable ("HOME") + "/Library/Developer/Xamarin/android-ndk"; + + var buildArch = new Action ((arch, folder) => { + StartProcess (SKIA_PATH.CombineWithFilePath ("platform_tools/android/bin/android_ninja").FullPath, new ProcessSettings { + Arguments = "-d " + arch + " skia_lib pdf sfntly icuuc", + WorkingDirectory = SKIA_PATH.FullPath, + }); + }); + + // set up the gyp environment variables + AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath); + SetEnvironmentVariable ("GYP_DEFINES", ""); + SetEnvironmentVariable ("GYP_GENERATORS", ""); + SetEnvironmentVariable ("BUILDTYPE", "Release"); + SetEnvironmentVariable ("ANDROID_HOME", ANDROID_HOME); + SetEnvironmentVariable ("ANDROID_SDK_ROOT", ANDROID_SDK_ROOT); + SetEnvironmentVariable ("ANDROID_NDK_HOME", ANDROID_NDK_HOME); + + SetEnvironmentVariable ("GYP_DEFINES", "skia_gpu=1"); + buildArch ("x86", "x86"); + SetEnvironmentVariable ("GYP_DEFINES", "skia_gpu=1"); + buildArch ("x86_64", "x86_64"); + SetEnvironmentVariable ("GYP_DEFINES", "arm_neon=1 arm_version=7 skia_gpu=1"); + buildArch ("arm_v7_neon", "armeabi-v7a"); + SetEnvironmentVariable ("GYP_DEFINES", "arm_neon=0 arm_version=8 skia_gpu=1"); + buildArch ("arm64", "arm64-v8a"); + + var ndkbuild = MakeAbsolute (Directory (ANDROID_NDK_HOME)).CombineWithFilePath ("ndk-build").FullPath; + StartProcess (ndkbuild, new ProcessSettings { + Arguments = "", + WorkingDirectory = ROOT_PATH.Combine ("native-builds/libSkiaSharp_android").FullPath, + }); + + foreach (var folder in new [] { "x86", "x86_64", "armeabi-v7a", "arm64-v8a" }) { + if (!DirectoryExists ("native-builds/lib/android/" + folder)) { + CreateDirectory ("native-builds/lib/android/" + folder); + } + CopyFileToDirectory ("native-builds/libSkiaSharp_android/libs/" + folder + "/libSkiaSharp.so", "native-builds/lib/android/" + folder); + } +}); + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// EXTERNALS DOWNLOAD - download any externals that are needed +//////////////////////////////////////////////////////////////////////////////////////////////////// + +Task ("externals-angle-uwp") + .WithCriteria (IsRunningOnWindows ()) + .WithCriteria (!FileExists (ANGLE_PATH.CombineWithFilePath ("uwp/ANGLE.WindowsStore.nuspec"))) + .Does (() => +{ + var angleVersion = "2.1.10"; + var angleUrl = "https://www.nuget.org/api/v2/package/ANGLE.WindowsStore/" + angleVersion; + var angleRoot = ANGLE_PATH.Combine ("uwp"); + var angleNupkg = angleRoot.CombineWithFilePath ("angle_" + angleVersion + ".nupkg"); + + if (!DirectoryExists (angleRoot)) { + CreateDirectory (angleRoot); + } else { + CleanDirectory (angleRoot); + } + DownloadFile (angleUrl, angleNupkg); + Unzip (angleNupkg, angleRoot); +}); + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// CLEAN - remove all the build artefacts +//////////////////////////////////////////////////////////////////////////////////////////////////// + +Task ("clean-externals").Does (() => +{ + // skia + CleanDirectories ("externals/skia/out"); + CleanDirectories ("externals/skia/xcodebuild"); + + // all + CleanDirectories ("native-builds/lib"); + // android + CleanDirectories ("native-builds/libSkiaSharp_android/obj"); + CleanDirectories ("native-builds/libSkiaSharp_android/libs"); + // ios + CleanDirectories ("native-builds/libSkiaSharp_ios/build"); + // tvos + CleanDirectories ("native-builds/libSkiaSharp_tvos/build"); + // osx + CleanDirectories ("native-builds/libSkiaSharp_osx/build"); + // windows + CleanDirectories ("native-builds/libSkiaSharp_windows/Release"); + CleanDirectories ("native-builds/libSkiaSharp_windows/x64/Release"); + // uwp + CleanDirectories ("native-builds/libSkiaSharp_uwp/Release"); + CleanDirectories ("native-builds/libSkiaSharp_uwp/x64/Release"); + CleanDirectories ("native-builds/libSkiaSharp_uwp/ARM/Release"); + CleanDirectories ("externals/angle/uwp"); + + // remove compatibility + InjectCompatibilityExternals (false); +}); diff --git a/cake/TransformToTvOS.cake b/cake/TransformToTvOS.cake new file mode 100644 index 000000000..777d6f669 --- /dev/null +++ b/cake/TransformToTvOS.cake @@ -0,0 +1,8 @@ + +var TransformToTvOS = new Action ((root) => { + var glob = root + "/*.xcodeproj/project.pbxproj"; + ReplaceTextInFiles (glob, "SDKROOT = iphoneos;", "SDKROOT = appletvos;"); + ReplaceTextInFiles (glob, "IPHONEOS_DEPLOYMENT_TARGET", "TVOS_DEPLOYMENT_TARGET"); + ReplaceTextInFiles (glob, "TARGETED_DEVICE_FAMILY = \"1,2\";", "TARGETED_DEVICE_FAMILY = 3;"); + ReplaceTextInFiles (glob, "\"CODE_SIGN_IDENTITY[sdk=iphoneos*]\" = \"iPhone Developer\";", ""); +}); diff --git a/cake/TransformToUWP.cake b/cake/TransformToUWP.cake new file mode 100644 index 000000000..f647115b1 --- /dev/null +++ b/cake/TransformToUWP.cake @@ -0,0 +1,88 @@ + +var TransformToUWP = new Action ((projectFilePath, platform) => { + var projectFile = MakeAbsolute (projectFilePath).FullPath; + var xdoc = XDocument.Load (projectFile); + + var configType = xdoc.Root + .Elements (MSBuildNS + "PropertyGroup") + .Elements (MSBuildNS + "ConfigurationType") + .Select (e => e.Value) + .FirstOrDefault (); + if (configType != "StaticLibrary") { + // skip over "Utility" projects as they aren't actually + // library projects, but intermediate build steps. + return; + } else { + // special case for ARM, gyp does not yet have ARM, + // so it defaults to Win32 + // update and reload + if (platform.ToUpper () == "ARM") { + ReplaceTextInFiles (projectFile, "Win32", "ARM"); + xdoc = XDocument.Load (projectFile); + } + } + + var rootNamespace = xdoc.Root + .Elements (MSBuildNS + "PropertyGroup") + .Elements (MSBuildNS + "RootNamespace") + .Select (e => e.Value) + .FirstOrDefault (); + var globals = xdoc.Root + .Elements (MSBuildNS + "PropertyGroup") + .Where (e => e.Attribute ("Label") != null && e.Attribute ("Label").Value == "Globals") + .Single (); + + globals.Elements (MSBuildNS + "WindowsTargetPlatformVersion").Remove (); + SetXValue (globals, "Keyword", "StaticLibrary"); + SetXValue (globals, "AppContainerApplication", "true"); + SetXValue (globals, "ApplicationType", "Windows Store"); + SetXValue (globals, "WindowsTargetPlatformVersion", "10.0.10586.0"); + SetXValue (globals, "WindowsTargetPlatformMinVersion", "10.0.10240.0"); + SetXValue (globals, "ApplicationTypeRevision", "10.0"); + SetXValue (globals, "DefaultLanguage", "en-US"); + + var properties = xdoc.Root + .Elements (MSBuildNS + "PropertyGroup") + .Elements (MSBuildNS + "LinkIncremental") + .First () + .Parent; + SetXValue (properties, "GenerateManifest","false"); + SetXValue (properties, "IgnoreImportLibrary","false"); + + SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "CompileAsWinRT", "false"); + AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";SK_BUILD_FOR_WINRT;WINAPI_FAMILY=WINAPI_FAMILY_APP;"); + // if (platform.ToUpper () == "ARM") { + // AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";__ARM_NEON;__ARM_NEON__;"); + // } + AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "DisableSpecificWarnings", ";4146;4703;"); + SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "SubSystem", "Console"); + SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "IgnoreAllDefaultLibraries", "false"); + SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "GenerateWindowsMetadata", "false"); + + xdoc.Root + .Elements (MSBuildNS + "ItemDefinitionGroup") + .Elements (MSBuildNS + "Link") + .Elements (MSBuildNS + "AdditionalDependencies") + .Remove (); + + if (rootNamespace == "pdf") { + // remove sfntly as this is not supported for winrt + RemoveXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", "SK_SFNTLY_SUBSETTER=\"sample/chromium/font_subsetter.h\""); + } else if (rootNamespace == "ports") { + RemoveFileReference (xdoc.Root, "SkFontHost_win.cpp"); + AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";SK_HAS_DWRITE_1_H;SK_HAS_DWRITE_2_H;"); + } else if (rootNamespace == "skgpu" ) { + // GL is not available to WinRT + RemoveFileReference (xdoc.Root, "GrGLCreateNativeInterface_none.cpp"); + AddFileReference (xdoc.Root, @"..\..\src\gpu\gl\GrGLCreateNativeInterface_none.cpp"); + RemoveFileReference (xdoc.Root, "GrGLCreateNativeInterface_win.cpp"); + RemoveFileReference (xdoc.Root, "SkCreatePlatformGLContext_win.cpp"); + } else if (rootNamespace == "utils" ) { + // GL is not available to WinRT + RemoveFileReference (xdoc.Root, "SkWGL.h"); + RemoveFileReference (xdoc.Root, "SkWGL_win.cpp"); + AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";SK_HAS_DWRITE_1_H;SK_HAS_DWRITE_2_H;"); + } + + xdoc.Save (projectFile); +}); diff --git a/cake/Utils.cake b/cake/Utils.cake new file mode 100644 index 000000000..66ee919a2 --- /dev/null +++ b/cake/Utils.cake @@ -0,0 +1,33 @@ + +var SetEnvironmentVariable = new Action ((name, value) => { + Information ("Setting Environment Variable {0} to {1}", name, value); + Environment.SetEnvironmentVariable (name, value, EnvironmentVariableTarget.Process); +}); + +var AppendEnvironmentVariable = new Action ((name, value) => { + var old = EnvironmentVariable (name); + var sep = IsRunningOnWindows () ? ';' : ':'; + + if (!old.ToUpper ().Split (sep).Contains (value.ToUpper ())) { + Information ("Adding {0} to Environment Variable {1}", value, name); + value += sep + old; + SetEnvironmentVariable (name, value); + } +}); + +void ListEnvironmentVariables () +{ + Information ("Environment Variables:"); + foreach (var envVar in EnvironmentVariables ()) { + Information ("\tKey: {0}\tValue: \"{1}\"", envVar.Key, envVar.Value); + } +} + +FilePath GetToolPath (FilePath toolPath) +{ + var appRoot = Context.Environment.GetApplicationRoot (); + var appRootExe = appRoot.Combine ("..").CombineWithFilePath (toolPath); + if (FileExists (appRootExe)) + return appRootExe; + throw new FileNotFoundException ("Unable to find tool: " + appRootExe); +} diff --git a/cake/UtilsMSBuild.cake b/cake/UtilsMSBuild.cake new file mode 100644 index 000000000..56af4f947 --- /dev/null +++ b/cake/UtilsMSBuild.cake @@ -0,0 +1,110 @@ + +var MSBuildNS = (XNamespace) "http://schemas.microsoft.com/developer/msbuild/2003"; + +var ProcessSolutionProjects = new Action> ((solutionFilePath, process) => { + var solutionFile = MakeAbsolute (solutionFilePath).FullPath; + foreach (var line in FileReadLines (solutionFile)) { + var match = Regex.Match (line, @"Project\(""(?.*)""\) = ""(?.*)"", ""(?.*)"", "".*"""); + if (match.Success && match.Groups ["type"].Value == "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") { + var path = match.Groups["path"].Value; + var projectFilePath = MakeAbsolute (solutionFilePath.GetDirectory ().CombineWithFilePath (path)); + Information ("Processing project file: " + projectFilePath); + process (match.Groups["name"].Value, projectFilePath); + } + } +}); + +var SetXValue = new Action ((root, element, value) => { + var node = root.Element (MSBuildNS + element); + if (node == null) + root.Add (new XElement (MSBuildNS + element, value)); + else + node.Value = value; +}); + +var AddXValue = new Action ((root, element, value) => { + var node = root.Element (MSBuildNS + element); + if (node == null) + root.Add (new XElement (MSBuildNS + element, value)); + else if (!node.Value.Contains (value)) + node.Value += value; +}); + +var RemoveXValue = new Action ((root, element, value) => { + var node = root.Element (MSBuildNS + element); + if (node != null) + node.Value = node.Value.Replace (value, string.Empty); +}); + +var SetXValues = new Action ((root, parents, element, value) => { + IEnumerable nodes = new [] { root }; + foreach (var p in parents) { + nodes = nodes.Elements (MSBuildNS + p); + } + foreach (var n in nodes) { + SetXValue (n, element, value); + } +}); + +var AddXValues = new Action ((root, parents, element, value) => { + IEnumerable nodes = new [] { root }; + foreach (var p in parents) { + nodes = nodes.Elements (MSBuildNS + p); + } + foreach (var n in nodes) { + AddXValue (n, element, value); + } +}); + +var RemoveXValues = new Action ((root, parents, element, value) => { + IEnumerable nodes = new [] { root }; + foreach (var p in parents) { + nodes = nodes.Elements (MSBuildNS + p); + } + foreach (var n in nodes) { + RemoveXValue (n, element, value); + } +}); + +var RemoveFileReference = new Action ((root, filename) => { + var element = root + .Elements (MSBuildNS + "ItemGroup") + .Elements (MSBuildNS + "ClCompile") + .Where (e => e.Attribute ("Include") != null) + .Where (e => e.Attribute ("Include").Value.Contains (filename)) + .FirstOrDefault (); + if (element != null) { + element.Remove (); + } +}); + +var AddFileReference = new Action ((root, filename) => { + var element = root + .Elements (MSBuildNS + "ItemGroup") + .Elements (MSBuildNS + "ClCompile") + .Where (e => e.Attribute ("Include") != null) + .Where (e => e.Attribute ("Include").Value.Contains (filename)) + .FirstOrDefault (); + if (element == null) { + root.Elements (MSBuildNS + "ItemGroup") + .Elements (MSBuildNS + "ClCompile") + .Last () + .Parent + .Add (new XElement (MSBuildNS + "ClCompile", new XAttribute ("Include", filename))); + } +}); + +var RedirectBuildOutputs = new Action ((projectFilePath) => { + var projectFile = MakeAbsolute (projectFilePath).FullPath; + var xdoc = XDocument.Load (projectFile); + + var properties = xdoc.Root + .Elements (MSBuildNS + "PropertyGroup") + .Elements (MSBuildNS + "LinkIncremental") + .First () + .Parent; + SetXValue (properties, "OutDir",@"$(SolutionDir)\bin\$(Platform)\$(Configuration)\"); + SetXValue (properties, "IntDir",@"$(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\"); + + xdoc.Save (projectFile); +}); diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake new file mode 100644 index 000000000..3125447a4 --- /dev/null +++ b/cake/UtilsManaged.cake @@ -0,0 +1,67 @@ + +var RunNuGetRestore = new Action ((solution) => +{ + NuGetRestore (solution, new NuGetRestoreSettings { + ToolPath = NugetToolPath, + Source = NuGetSources, + Verbosity = NuGetVerbosity.Detailed + }); +}); + +var PackageNuGet = new Action ((nuspecPath, outputPath) => +{ + if (!DirectoryExists (outputPath)) { + CreateDirectory (outputPath); + } + + NuGetPack (nuspecPath, new NuGetPackSettings { + Verbosity = NuGetVerbosity.Detailed, + OutputDirectory = outputPath, + BasePath = "./", + ToolPath = NugetToolPath + }); +}); + +var RunTests = new Action ((testAssembly) => +{ + var dir = testAssembly.GetDirectory (); + var result = StartProcess (NUnitConsoleToolPath, new ProcessSettings { + Arguments = string.Format ("\"{0}\" --work=\"{1}\"", testAssembly, dir), + }); + + if (result != 0) { + throw new Exception ("NUnit test failed with error: " + result); + } +}); + +var RunMdocUpdate = new Action ((assembly, docsRoot) => +{ + StartProcess (MDocPath, new ProcessSettings { + Arguments = string.Format ("update --delete --out=\"{0}\" \"{1}\"", docsRoot, assembly), + }); +}); + +var RunMdocMSXml = new Action ((docsRoot, output) => +{ + StartProcess (MDocPath, new ProcessSettings { + Arguments = string.Format ("export-msxdoc --out=\"{0}\" \"{1}\"", output, docsRoot), + }); +}); + +var RunMdocAssemble = new Action ((docsRoot, output) => +{ + StartProcess (MDocPath, new ProcessSettings { + Arguments = string.Format ("assemble --out=\"{0}\" \"{1}\"", output, docsRoot), + }); +}); + +var ClearSkiaSharpNuGetCache = new Action (() => { + // first we need to add our new nuget to the cache so we can restore + // we first need to delete the old stuff + DirectoryPath home = EnvironmentVariable ("USERPROFILE") ?? EnvironmentVariable ("HOME"); + var installedNuGet = home.Combine (".nuget").Combine ("packages").Combine ("SkiaSharp"); + if (DirectoryExists (installedNuGet)) { + Warning ("SkiaSharp nugets were installed at '{0}', removing...", installedNuGet); + CleanDirectory (installedNuGet); + } +}); diff --git a/cake/UtilsNative.cake b/cake/UtilsNative.cake new file mode 100644 index 000000000..f87ab3c49 --- /dev/null +++ b/cake/UtilsNative.cake @@ -0,0 +1,48 @@ + +var RunGyp = new Action ((defines, generators) => +{ + SetEnvironmentVariable ("GYP_GENERATORS", generators); + SetEnvironmentVariable ("GYP_DEFINES", defines); + + Information ("Running 'sync-and-gyp'..."); + Information ("\tGYP_GENERATORS = " + EnvironmentVariable ("GYP_GENERATORS")); + Information ("\tGYP_DEFINES = " + EnvironmentVariable ("GYP_DEFINES")); + + var result = StartProcess ("python", new ProcessSettings { + Arguments = SKIA_PATH.CombineWithFilePath("bin/sync-and-gyp").FullPath, + WorkingDirectory = SKIA_PATH.FullPath, + }); + if (result != 0) { + throw new Exception ("sync-and-gyp failed with error: " + result); + } +}); + +var RunInstallNameTool = new Action ((directory, oldName, newName, library) => +{ + if (!IsRunningOnUnix ()) { + throw new InvalidOperationException ("install_name_tool is only available on Unix."); + } + + StartProcess ("install_name_tool", new ProcessSettings { + Arguments = string.Format("-change {0} {1} \"{2}\"", oldName, newName, library), + WorkingDirectory = directory, + }); +}); + +var RunLipo = new Action ((directory, output, inputs) => +{ + if (!IsRunningOnUnix ()) { + throw new InvalidOperationException ("lipo is only available on Unix."); + } + + var dir = directory.CombineWithFilePath (output).GetDirectory (); + if (!DirectoryExists (dir)) { + CreateDirectory (dir); + } + + var inputString = string.Join(" ", inputs.Select (i => string.Format ("\"{0}\"", i))); + StartProcess ("lipo", new ProcessSettings { + Arguments = string.Format("-create -output \"{0}\" {1}", output, inputString), + WorkingDirectory = directory, + }); +}); diff --git a/externals/.gitignore b/externals/.gitignore new file mode 100644 index 000000000..6be140ee2 --- /dev/null +++ b/externals/.gitignore @@ -0,0 +1 @@ +angle/ \ No newline at end of file diff --git a/externals/depot_tools b/externals/depot_tools index db8b83932..7475196d4 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit db8b839320168ab4f5156399ecb275478c0aa2cd +Subproject commit 7475196d4c32d66e1c199bf24945b7ae28255e13 diff --git a/externals/keys/mono.pub b/mono.pub similarity index 100% rename from externals/keys/mono.pub rename to mono.pub diff --git a/externals/keys/mono.snk b/mono.snk similarity index 100% rename from externals/keys/mono.snk rename to mono.snk diff --git a/native-builds/libSkiaSharp_android/jni/SkiaSharp.mk b/native-builds/libSkiaSharp_android/jni/SkiaSharp.mk index 717f6962e..dd1250dd8 100644 --- a/native-builds/libSkiaSharp_android/jni/SkiaSharp.mk +++ b/native-builds/libSkiaSharp_android/jni/SkiaSharp.mk @@ -21,16 +21,16 @@ LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2 -lz LOCAL_MODULE := SkiaSharp -LOCAL_C_INCLUDES := ../../skia/src/c \ - ../../skia/include/c \ - ../../skia/include/core \ - ../../skia/include/codec \ - ../../skia/include/effects \ - ../../skia/include/pathops \ - ../../skia/include/gpu \ - ../../skia/include/config \ - ../../skia/include/utils \ - ../../skia/include/images +LOCAL_C_INCLUDES := ../../externals/skia/src/c \ + ../../externals/skia/include/c \ + ../../externals/skia/include/core \ + ../../externals/skia/include/codec \ + ../../externals/skia/include/effects \ + ../../externals/skia/include/pathops \ + ../../externals/skia/include/gpu \ + ../../externals/skia/include/config \ + ../../externals/skia/include/utils \ + ../../externals/skia/include/images LOCAL_CFLAGS := -DSK_INTERNAL -DSK_GAMMA_APPLY_TO_A8 \ -DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 -DSK_SUPPORT_GPU=1 \ diff --git a/native-builds/libSkiaSharp_android/jni/skia_prebuilt.mk b/native-builds/libSkiaSharp_android/jni/skia_prebuilt.mk index de4e059fb..76811d1ef 100644 --- a/native-builds/libSkiaSharp_android/jni/skia_prebuilt.mk +++ b/native-builds/libSkiaSharp_android/jni/skia_prebuilt.mk @@ -1,15 +1,15 @@ ifeq ($(TARGET_ARCH_ABI),x86) - SKIA_ANDROID_RELEASE=../../../skia/out/config/android-x86/Release + SKIA_ANDROID_RELEASE=../../../externals/skia/out/config/android-x86/Release else ifeq ($(TARGET_ARCH_ABI),x86_64) - SKIA_ANDROID_RELEASE=../../../skia/out/config/android-x86_64/Release + SKIA_ANDROID_RELEASE=../../../externals/skia/out/config/android-x86_64/Release else ifeq ($(TARGET_ARCH_ABI),armeabi) - SKIA_ANDROID_RELEASE=../../../skia/out/config/android-arm/Release + SKIA_ANDROID_RELEASE=../../../externals/skia/out/config/android-arm/Release else ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) - SKIA_ANDROID_RELEASE=../../../skia/out/config/android-arm_v7_neon/Release + SKIA_ANDROID_RELEASE=../../../externals/skia/out/config/android-arm_v7_neon/Release else ifeq ($(TARGET_ARCH_ABI),arm64-v8a) - SKIA_ANDROID_RELEASE=../../../skia/out/config/android-arm64/Release + SKIA_ANDROID_RELEASE=../../../externals/skia/out/config/android-arm64/Release endif include $(CLEAR_VARS) diff --git a/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj index d5a6d9914..bd77143d3 100644 --- a/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_ios/libSkiaSharp.xcodeproj/project.pbxproj @@ -698,19 +698,19 @@ 21FD2B301C014C000023CFAE /* libSkiaSharp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libSkiaSharp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 21FD2B331C014C000023CFAE /* libSkiaSharp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libSkiaSharp.h; sourceTree = ""; }; 21FD2B351C014C000023CFAE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 21FD2CE11C015ED60023CFAE /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../skia/out/gyp/codec_android.xcodeproj; sourceTree = ""; }; - 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../skia/out/gyp/codec.xcodeproj; sourceTree = ""; }; - 21FD2CEC1C015ED60023CFAE /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../../skia/out/gyp/core.xcodeproj; sourceTree = ""; }; - 21FD2CEF1C015ED60023CFAE /* effects.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = effects.xcodeproj; path = ../../skia/out/gyp/effects.xcodeproj; sourceTree = ""; }; - 21FD2CF21C015ED60023CFAE /* gpu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gpu.xcodeproj; path = ../../skia/out/gyp/gpu.xcodeproj; sourceTree = ""; }; - 21FD2CF51C015ED60023CFAE /* images.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = images.xcodeproj; path = ../../skia/out/gyp/images.xcodeproj; sourceTree = ""; }; - 21FD2CFA1C015ED60023CFAE /* opts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = opts.xcodeproj; path = ../../skia/out/gyp/opts.xcodeproj; sourceTree = ""; }; - 21FD2CFD1C015ED60023CFAE /* ports.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ports.xcodeproj; path = ../../skia/out/gyp/ports.xcodeproj; sourceTree = ""; }; - 21FD2D001C015ED60023CFAE /* sfnt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfnt.xcodeproj; path = ../../skia/out/gyp/sfnt.xcodeproj; sourceTree = ""; }; - 21FD2D031C015ED70023CFAE /* utils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = utils.xcodeproj; path = ../../skia/out/gyp/utils.xcodeproj; sourceTree = ""; }; + 21FD2CE11C015ED60023CFAE /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../externals/skia/out/gyp/codec_android.xcodeproj; sourceTree = ""; }; + 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../externals/skia/out/gyp/codec.xcodeproj; sourceTree = ""; }; + 21FD2CEC1C015ED60023CFAE /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../../externals/skia/out/gyp/core.xcodeproj; sourceTree = ""; }; + 21FD2CEF1C015ED60023CFAE /* effects.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = effects.xcodeproj; path = ../../externals/skia/out/gyp/effects.xcodeproj; sourceTree = ""; }; + 21FD2CF21C015ED60023CFAE /* gpu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gpu.xcodeproj; path = ../../externals/skia/out/gyp/gpu.xcodeproj; sourceTree = ""; }; + 21FD2CF51C015ED60023CFAE /* images.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = images.xcodeproj; path = ../../externals/skia/out/gyp/images.xcodeproj; sourceTree = ""; }; + 21FD2CFA1C015ED60023CFAE /* opts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = opts.xcodeproj; path = ../../externals/skia/out/gyp/opts.xcodeproj; sourceTree = ""; }; + 21FD2CFD1C015ED60023CFAE /* ports.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ports.xcodeproj; path = ../../externals/skia/out/gyp/ports.xcodeproj; sourceTree = ""; }; + 21FD2D001C015ED60023CFAE /* sfnt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfnt.xcodeproj; path = ../../externals/skia/out/gyp/sfnt.xcodeproj; sourceTree = ""; }; + 21FD2D031C015ED70023CFAE /* utils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = utils.xcodeproj; path = ../../externals/skia/out/gyp/utils.xcodeproj; sourceTree = ""; }; 21FD2D411C015F780023CFAE /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; - 21FD2D6F1C0162C70023CFAE /* ktx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ktx.xcodeproj; path = ../../skia/out/gyp/ktx.xcodeproj; sourceTree = ""; }; - 21FD2D781C0163130023CFAE /* etc1.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = etc1.xcodeproj; path = ../../skia/out/gyp/etc1.xcodeproj; sourceTree = ""; }; + 21FD2D6F1C0162C70023CFAE /* ktx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ktx.xcodeproj; path = ../../externals/skia/out/gyp/ktx.xcodeproj; sourceTree = ""; }; + 21FD2D781C0163130023CFAE /* etc1.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = etc1.xcodeproj; path = ../../externals/skia/out/gyp/etc1.xcodeproj; sourceTree = ""; }; 21FD2DA01C0167220023CFAE /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 21FD2DA21C0167490023CFAE /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; 21FD2DA41C01677B0023CFAE /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; @@ -723,16 +723,16 @@ 340303931C4053E500630F26 /* SkManagedStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedStream.h; path = ../src/SkManagedStream.h; sourceTree = ""; }; 340303DA1C40877300630F26 /* sk_xamarin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_xamarin.cpp; path = ../../src/sk_xamarin.cpp; sourceTree = ""; }; 343DAE451C3F285700FAD826 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../../src/SkiaKeeper.c; sourceTree = ""; }; - 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../skia/out/gyp/pdf.xcodeproj; sourceTree = ""; }; - 3454C31A1D011F5F008A8A1A /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../skia/out/gyp/skia_lib.xcodeproj; sourceTree = ""; }; - 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../skia/out/gyp/libpng.xcodeproj; sourceTree = ""; }; - 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../skia/out/gyp/zlib.xcodeproj; sourceTree = ""; }; - 3454C3231D011F5F008A8A1A /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../skia/out/gyp/giflib.xcodeproj; sourceTree = ""; }; - 34BEEE591D1AAC73002A1E48 /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; - 34BEEE5C1D1AAC73002A1E48 /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; - 34F197851C61883C00B41B54 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; - 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; - 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; + 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../externals/skia/out/gyp/pdf.xcodeproj; sourceTree = ""; }; + 3454C31A1D011F5F008A8A1A /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../externals/skia/out/gyp/skia_lib.xcodeproj; sourceTree = ""; }; + 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../externals/skia/out/gyp/libpng.xcodeproj; sourceTree = ""; }; + 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../externals/skia/out/gyp/zlib.xcodeproj; sourceTree = ""; }; + 3454C3231D011F5F008A8A1A /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../externals/skia/out/gyp/giflib.xcodeproj; sourceTree = ""; }; + 34BEEE591D1AAC73002A1E48 /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../externals/skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; + 34BEEE5C1D1AAC73002A1E48 /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../externals/skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; + 34F197851C61883C00B41B54 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../externals/skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; + 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../externals/skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; + 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../externals/skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1930,15 +1930,15 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; HEADER_SEARCH_PATHS = ( - ../../skia/src/c, - ../../skia/include/c, - ../../skia/include/core, - ../../skia/include/codec, - ../../skia/include/effects, - ../../skia/include/pathops, - ../../skia/include/utils, - ../../skia/include/gpu, - ../../skia/include/config, + ../../externals/skia/src/c, + ../../externals/skia/include/c, + ../../externals/skia/include/core, + ../../externals/skia/include/codec, + ../../externals/skia/include/effects, + ../../externals/skia/include/pathops, + ../../externals/skia/include/utils, + ../../externals/skia/include/gpu, + ../../externals/skia/include/config, ); INFOPLIST_FILE = libSkiaSharp/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1966,15 +1966,15 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; HEADER_SEARCH_PATHS = ( - ../../skia/src/c, - ../../skia/include/c, - ../../skia/include/core, - ../../skia/include/codec, - ../../skia/include/effects, - ../../skia/include/pathops, - ../../skia/include/utils, - ../../skia/include/gpu, - ../../skia/include/config, + ../../externals/skia/src/c, + ../../externals/skia/include/c, + ../../externals/skia/include/core, + ../../externals/skia/include/codec, + ../../externals/skia/include/effects, + ../../externals/skia/include/pathops, + ../../externals/skia/include/utils, + ../../externals/skia/include/gpu, + ../../externals/skia/include/config, ); INFOPLIST_FILE = libSkiaSharp/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj index 397ba83e1..75b5fefd0 100644 --- a/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj @@ -535,43 +535,43 @@ /* Begin PBXFileReference section */ 21C951551C03D27A003A1E1D /* libSkiaSharp.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSkiaSharp.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; - 21C951661C03D363003A1E1D /* sfnt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfnt.xcodeproj; path = ../../skia/out/gyp/sfnt.xcodeproj; sourceTree = ""; }; - 21C9516C1C03D36D003A1E1D /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../../skia/out/gyp/core.xcodeproj; sourceTree = ""; }; - 21C951781C03D380003A1E1D /* effects.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = effects.xcodeproj; path = ../../skia/out/gyp/effects.xcodeproj; sourceTree = ""; }; - 21C9517E1C03D38A003A1E1D /* images.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = images.xcodeproj; path = ../../skia/out/gyp/images.xcodeproj; sourceTree = ""; }; - 21C951881C03D392003A1E1D /* opts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = opts.xcodeproj; path = ../../skia/out/gyp/opts.xcodeproj; sourceTree = ""; }; - 21C951A11C03D39B003A1E1D /* gpu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gpu.xcodeproj; path = ../../skia/out/gyp/gpu.xcodeproj; sourceTree = ""; }; + 21C951661C03D363003A1E1D /* sfnt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfnt.xcodeproj; path = ../../externals/skia/out/gyp/sfnt.xcodeproj; sourceTree = ""; }; + 21C9516C1C03D36D003A1E1D /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../../externals/skia/out/gyp/core.xcodeproj; sourceTree = ""; }; + 21C951781C03D380003A1E1D /* effects.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = effects.xcodeproj; path = ../../externals/skia/out/gyp/effects.xcodeproj; sourceTree = ""; }; + 21C9517E1C03D38A003A1E1D /* images.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = images.xcodeproj; path = ../../externals/skia/out/gyp/images.xcodeproj; sourceTree = ""; }; + 21C951881C03D392003A1E1D /* opts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = opts.xcodeproj; path = ../../externals/skia/out/gyp/opts.xcodeproj; sourceTree = ""; }; + 21C951A11C03D39B003A1E1D /* gpu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gpu.xcodeproj; path = ../../externals/skia/out/gyp/gpu.xcodeproj; sourceTree = ""; }; 21C951B91C03D3DB003A1E1D /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 21C951BB1C03D3EA003A1E1D /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; 21C951BD1C03D3FD003A1E1D /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; }; 21C951BF1C03D409003A1E1D /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; 21C951C11C03D419003A1E1D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 21C951CC1C03D465003A1E1D /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; - 21C951CE1C03D4B8003A1E1D /* ports.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ports.xcodeproj; path = ../../skia/out/gyp/ports.xcodeproj; sourceTree = ""; }; - 21C951D71C03D4F9003A1E1D /* ktx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ktx.xcodeproj; path = ../../skia/out/gyp/ktx.xcodeproj; sourceTree = ""; }; - 21C951E01C03D528003A1E1D /* utils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = utils.xcodeproj; path = ../../skia/out/gyp/utils.xcodeproj; sourceTree = ""; }; - 21C951ED1C03D551003A1E1D /* etc1.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = etc1.xcodeproj; path = ../../skia/out/gyp/etc1.xcodeproj; sourceTree = ""; }; + 21C951CE1C03D4B8003A1E1D /* ports.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ports.xcodeproj; path = ../../externals/skia/out/gyp/ports.xcodeproj; sourceTree = ""; }; + 21C951D71C03D4F9003A1E1D /* ktx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ktx.xcodeproj; path = ../../externals/skia/out/gyp/ktx.xcodeproj; sourceTree = ""; }; + 21C951E01C03D528003A1E1D /* utils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = utils.xcodeproj; path = ../../externals/skia/out/gyp/utils.xcodeproj; sourceTree = ""; }; + 21C951ED1C03D551003A1E1D /* etc1.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = etc1.xcodeproj; path = ../../externals/skia/out/gyp/etc1.xcodeproj; sourceTree = ""; }; 340303821C404C3D00630F26 /* sk_xamarin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_xamarin.cpp; path = ../src/sk_xamarin.cpp; sourceTree = ""; }; 3403038E1C404FD100630F26 /* sk_xamarin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_xamarin.h; path = ../src/sk_xamarin.h; sourceTree = ""; }; 340303981C40543C00630F26 /* sk_managedstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_managedstream.cpp; path = ../src/sk_managedstream.cpp; sourceTree = ""; }; 340303991C40543C00630F26 /* sk_managedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sk_managedstream.h; path = ../src/sk_managedstream.h; sourceTree = ""; }; 3403039A1C40543C00630F26 /* SkManagedStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedStream.cpp; path = ../src/SkManagedStream.cpp; sourceTree = ""; }; 3403039B1C40543C00630F26 /* SkManagedStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedStream.h; path = ../src/SkManagedStream.h; sourceTree = ""; }; - 342959891C616FA000BF1BB6 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; - 3429598C1C616FA000BF1BB6 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; - 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; + 342959891C616FA000BF1BB6 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../externals/skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; + 3429598C1C616FA000BF1BB6 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../externals/skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; + 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../externals/skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; 343DAE2E1C3F26CF00FAD826 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../src/SkiaKeeper.c; sourceTree = ""; }; - 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfntly.xcodeproj; path = ../../skia/out/gyp/sfntly.xcodeproj; sourceTree = ""; }; - 3488ADFC1D1ADC3F00BE2DC3 /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; - 3488ADFF1D1ADC3F00BE2DC3 /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; - 3488AE021D1ADC3F00BE2DC3 /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../skia/out/gyp/zlib.xcodeproj; sourceTree = ""; }; - 34FEFE781D015718002A83B6 /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../skia/out/gyp/codec_android.xcodeproj; sourceTree = ""; }; - 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../skia/out/gyp/codec.xcodeproj; sourceTree = ""; }; - 34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../skia/out/gyp/giflib.xcodeproj; sourceTree = ""; }; - 34FEFE811D015718002A83B6 /* icu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = icu.xcodeproj; path = ../../skia/out/gyp/icu.xcodeproj; sourceTree = ""; }; - 34FEFE841D015718002A83B6 /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../skia/out/gyp/libpng.xcodeproj; sourceTree = ""; }; - 34FEFE871D015718002A83B6 /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../skia/out/gyp/pdf.xcodeproj; sourceTree = ""; }; - 34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../skia/out/gyp/skia_lib.xcodeproj; sourceTree = ""; }; + 344B476D1D1ADD6A00EFE6F9 /* sfntly.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfntly.xcodeproj; path = ../../externals/skia/out/gyp/sfntly.xcodeproj; sourceTree = ""; }; + 3488ADFC1D1ADC3F00BE2DC3 /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../externals/skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; + 3488ADFF1D1ADC3F00BE2DC3 /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../externals/skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; + 3488AE021D1ADC3F00BE2DC3 /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../externals/skia/out/gyp/zlib.xcodeproj; sourceTree = ""; }; + 34FEFE781D015718002A83B6 /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../externals/skia/out/gyp/codec_android.xcodeproj; sourceTree = ""; }; + 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../externals/skia/out/gyp/codec.xcodeproj; sourceTree = ""; }; + 34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../externals/skia/out/gyp/giflib.xcodeproj; sourceTree = ""; }; + 34FEFE811D015718002A83B6 /* icu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = icu.xcodeproj; path = ../../externals/skia/out/gyp/icu.xcodeproj; sourceTree = ""; }; + 34FEFE841D015718002A83B6 /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../externals/skia/out/gyp/libpng.xcodeproj; sourceTree = ""; }; + 34FEFE871D015718002A83B6 /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../externals/skia/out/gyp/pdf.xcodeproj; sourceTree = ""; }; + 34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../externals/skia/out/gyp/skia_lib.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1628,15 +1628,15 @@ DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; HEADER_SEARCH_PATHS = ( - ../../skia/src/c, - ../../skia/include/c, - ../../skia/include/core, - ../../skia/include/codec, - ../../skia/include/effects, - ../../skia/include/pathops, - ../../skia/include/gpu, - ../../skia/include/utils, - ../../skia/include/config, + ../../externals/skia/src/c, + ../../externals/skia/include/c, + ../../externals/skia/include/core, + ../../externals/skia/include/codec, + ../../externals/skia/include/effects, + ../../externals/skia/include/pathops, + ../../externals/skia/include/gpu, + ../../externals/skia/include/utils, + ../../externals/skia/include/config, ); MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CPLUSPLUSFLAGS = ( @@ -1656,15 +1656,15 @@ DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = ""; HEADER_SEARCH_PATHS = ( - ../../skia/src/c, - ../../skia/include/c, - ../../skia/include/core, - ../../skia/include/codec, - ../../skia/include/effects, - ../../skia/include/pathops, - ../../skia/include/gpu, - ../../skia/include/utils, - ../../skia/include/config, + ../../externals/skia/src/c, + ../../externals/skia/include/c, + ../../externals/skia/include/core, + ../../externals/skia/include/codec, + ../../externals/skia/include/effects, + ../../externals/skia/include/pathops, + ../../externals/skia/include/gpu, + ../../externals/skia/include/utils, + ../../externals/skia/include/config, ); MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CPLUSPLUSFLAGS = ( diff --git a/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj b/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj index 12f2c431f..f345cf43b 100644 --- a/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native-builds/libSkiaSharp_tvos/libSkiaSharp.xcodeproj/project.pbxproj @@ -698,19 +698,19 @@ 21FD2B301C014C000023CFAE /* libSkiaSharp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libSkiaSharp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 21FD2B331C014C000023CFAE /* libSkiaSharp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libSkiaSharp.h; sourceTree = ""; }; 21FD2B351C014C000023CFAE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 21FD2CE11C015ED60023CFAE /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../skia/out/gyp/codec_android.xcodeproj; sourceTree = ""; }; - 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../skia/out/gyp/codec.xcodeproj; sourceTree = ""; }; - 21FD2CEC1C015ED60023CFAE /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../../skia/out/gyp/core.xcodeproj; sourceTree = ""; }; - 21FD2CEF1C015ED60023CFAE /* effects.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = effects.xcodeproj; path = ../../skia/out/gyp/effects.xcodeproj; sourceTree = ""; }; - 21FD2CF21C015ED60023CFAE /* gpu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gpu.xcodeproj; path = ../../skia/out/gyp/gpu.xcodeproj; sourceTree = ""; }; - 21FD2CF51C015ED60023CFAE /* images.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = images.xcodeproj; path = ../../skia/out/gyp/images.xcodeproj; sourceTree = ""; }; - 21FD2CFA1C015ED60023CFAE /* opts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = opts.xcodeproj; path = ../../skia/out/gyp/opts.xcodeproj; sourceTree = ""; }; - 21FD2CFD1C015ED60023CFAE /* ports.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ports.xcodeproj; path = ../../skia/out/gyp/ports.xcodeproj; sourceTree = ""; }; - 21FD2D001C015ED60023CFAE /* sfnt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfnt.xcodeproj; path = ../../skia/out/gyp/sfnt.xcodeproj; sourceTree = ""; }; - 21FD2D031C015ED70023CFAE /* utils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = utils.xcodeproj; path = ../../skia/out/gyp/utils.xcodeproj; sourceTree = ""; }; + 21FD2CE11C015ED60023CFAE /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../externals/skia/out/gyp/codec_android.xcodeproj; sourceTree = ""; }; + 21FD2CE41C015ED60023CFAE /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../externals/skia/out/gyp/codec.xcodeproj; sourceTree = ""; }; + 21FD2CEC1C015ED60023CFAE /* core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = core.xcodeproj; path = ../../externals/skia/out/gyp/core.xcodeproj; sourceTree = ""; }; + 21FD2CEF1C015ED60023CFAE /* effects.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = effects.xcodeproj; path = ../../externals/skia/out/gyp/effects.xcodeproj; sourceTree = ""; }; + 21FD2CF21C015ED60023CFAE /* gpu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = gpu.xcodeproj; path = ../../externals/skia/out/gyp/gpu.xcodeproj; sourceTree = ""; }; + 21FD2CF51C015ED60023CFAE /* images.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = images.xcodeproj; path = ../../externals/skia/out/gyp/images.xcodeproj; sourceTree = ""; }; + 21FD2CFA1C015ED60023CFAE /* opts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = opts.xcodeproj; path = ../../externals/skia/out/gyp/opts.xcodeproj; sourceTree = ""; }; + 21FD2CFD1C015ED60023CFAE /* ports.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ports.xcodeproj; path = ../../externals/skia/out/gyp/ports.xcodeproj; sourceTree = ""; }; + 21FD2D001C015ED60023CFAE /* sfnt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfnt.xcodeproj; path = ../../externals/skia/out/gyp/sfnt.xcodeproj; sourceTree = ""; }; + 21FD2D031C015ED70023CFAE /* utils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = utils.xcodeproj; path = ../../externals/skia/out/gyp/utils.xcodeproj; sourceTree = ""; }; 21FD2D411C015F780023CFAE /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; - 21FD2D6F1C0162C70023CFAE /* ktx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ktx.xcodeproj; path = ../../skia/out/gyp/ktx.xcodeproj; sourceTree = ""; }; - 21FD2D781C0163130023CFAE /* etc1.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = etc1.xcodeproj; path = ../../skia/out/gyp/etc1.xcodeproj; sourceTree = ""; }; + 21FD2D6F1C0162C70023CFAE /* ktx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ktx.xcodeproj; path = ../../externals/skia/out/gyp/ktx.xcodeproj; sourceTree = ""; }; + 21FD2D781C0163130023CFAE /* etc1.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = etc1.xcodeproj; path = ../../externals/skia/out/gyp/etc1.xcodeproj; sourceTree = ""; }; 21FD2DA01C0167220023CFAE /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 21FD2DA21C0167490023CFAE /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; 21FD2DA41C01677B0023CFAE /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; @@ -722,17 +722,17 @@ 340303921C4053E500630F26 /* SkManagedStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkManagedStream.cpp; path = ../src/SkManagedStream.cpp; sourceTree = ""; }; 340303931C4053E500630F26 /* SkManagedStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkManagedStream.h; path = ../src/SkManagedStream.h; sourceTree = ""; }; 340303DA1C40877300630F26 /* sk_xamarin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sk_xamarin.cpp; path = ../../src/sk_xamarin.cpp; sourceTree = ""; }; - 342BF1791D1ADCFD0072D19E /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; - 342BF17C1D1ADCFD0072D19E /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; + 342BF1791D1ADCFD0072D19E /* dng_sdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dng_sdk.xcodeproj; path = ../../externals/skia/out/gyp/dng_sdk.xcodeproj; sourceTree = ""; }; + 342BF17C1D1ADCFD0072D19E /* piex.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = piex.xcodeproj; path = ../../externals/skia/out/gyp/piex.xcodeproj; sourceTree = ""; }; 343DAE451C3F285700FAD826 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../../src/SkiaKeeper.c; sourceTree = ""; }; - 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../skia/out/gyp/pdf.xcodeproj; sourceTree = ""; }; - 3454C31A1D011F5F008A8A1A /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../skia/out/gyp/skia_lib.xcodeproj; sourceTree = ""; }; - 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../skia/out/gyp/libpng.xcodeproj; sourceTree = ""; }; - 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../skia/out/gyp/zlib.xcodeproj; sourceTree = ""; }; - 3454C3231D011F5F008A8A1A /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../skia/out/gyp/giflib.xcodeproj; sourceTree = ""; }; - 34F197851C61883C00B41B54 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; - 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; - 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; + 3454C2F01D011F3F008A8A1A /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../externals/skia/out/gyp/pdf.xcodeproj; sourceTree = ""; }; + 3454C31A1D011F5F008A8A1A /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../externals/skia/out/gyp/skia_lib.xcodeproj; sourceTree = ""; }; + 3454C31D1D011F5F008A8A1A /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../externals/skia/out/gyp/libpng.xcodeproj; sourceTree = ""; }; + 3454C3201D011F5F008A8A1A /* zlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = zlib.xcodeproj; path = ../../externals/skia/out/gyp/zlib.xcodeproj; sourceTree = ""; }; + 3454C3231D011F5F008A8A1A /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../externals/skia/out/gyp/giflib.xcodeproj; sourceTree = ""; }; + 34F197851C61883C00B41B54 /* libjpeg-turbo-selector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo-selector.xcodeproj"; path = "../../externals/skia/out/gyp/libjpeg-turbo-selector.xcodeproj"; sourceTree = ""; }; + 34F197881C61883C00B41B54 /* libjpeg-turbo.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "libjpeg-turbo.xcodeproj"; path = "../../externals/skia/out/gyp/libjpeg-turbo.xcodeproj"; sourceTree = ""; }; + 34F1978B1C61883C00B41B54 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../externals/skia/out/gyp/libwebp.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1925,15 +1925,15 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; HEADER_SEARCH_PATHS = ( - ../../skia/src/c, - ../../skia/include/c, - ../../skia/include/core, - ../../skia/include/codec, - ../../skia/include/effects, - ../../skia/include/pathops, - ../../skia/include/gpu, - ../../skia/include/utils, - ../../skia/include/config, + ../../externals/skia/src/c, + ../../externals/skia/include/c, + ../../externals/skia/include/core, + ../../externals/skia/include/codec, + ../../externals/skia/include/effects, + ../../externals/skia/include/pathops, + ../../externals/skia/include/gpu, + ../../externals/skia/include/utils, + ../../externals/skia/include/config, ); INFOPLIST_FILE = libSkiaSharp/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1961,15 +1961,15 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; HEADER_SEARCH_PATHS = ( - ../../skia/src/c, - ../../skia/include/c, - ../../skia/include/core, - ../../skia/include/codec, - ../../skia/include/effects, - ../../skia/include/pathops, - ../../skia/include/utils, - ../../skia/include/gpu, - ../../skia/include/config, + ../../externals/skia/src/c, + ../../externals/skia/include/c, + ../../externals/skia/include/core, + ../../externals/skia/include/codec, + ../../externals/skia/include/effects, + ../../externals/skia/include/pathops, + ../../externals/skia/include/utils, + ../../externals/skia/include/gpu, + ../../externals/skia/include/config, ); INFOPLIST_FILE = libSkiaSharp/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/native-builds/libSkiaSharp_uwp/libSkiaSharp.vcxproj b/native-builds/libSkiaSharp_uwp/libSkiaSharp.vcxproj index f4b5dc077..26b7641b1 100644 --- a/native-builds/libSkiaSharp_uwp/libSkiaSharp.vcxproj +++ b/native-builds/libSkiaSharp_uwp/libSkiaSharp.vcxproj @@ -36,6 +36,8 @@ 10.0.10586.0 10.0.10240.0 10.0 + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ @@ -130,9 +132,6 @@ false false - - $(SolutionDir)$(Configuration)\ - @@ -142,7 +141,7 @@ Disabled _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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Console @@ -162,7 +161,7 @@ true 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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Console @@ -180,7 +179,7 @@ Disabled _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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Console @@ -201,7 +200,7 @@ true 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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Console @@ -222,7 +221,7 @@ Disabled _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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Console @@ -243,7 +242,7 @@ true 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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Console @@ -269,106 +268,106 @@ - + {16f70b29-3f1a-5d36-8fd9-e069d7ed5320} - + {33835bfb-8f8b-4120-2d5c-973a743f30a5} - + {b7760b5e-bfa8-486b-acfd-49e3a6de8e76} - + {e6ac5ad9-ba72-e396-9af0-5bcedee32a44} - + {200809b7-4c62-7592-f47e-bf262809fa50} - + {ba21e9d1-3d2f-7622-2e1f-fbf186ff5677} - + {31057ac5-dc70-dea7-3e96-9c6fa063245e} - + {a3bcdeca-94f5-1729-484e-180b50c89ad6} - + {6137ced9-8009-c4c3-7a63-4a524a1cdbc8} - + {bf42c422-f0ea-bd6c-5e01-abf4694803b5} - + {35bbcd7a-909d-957f-ada0-c09939e0916f} - + {c984027d-7bfe-3d92-8d87-082486d7334e} - + {f928143d-140d-ed62-0598-451d0e6cca74} - + {96b0bb48-4ede-1509-254e-8f8261eade2c} - + {b6991969-ed48-fd8c-9059-7ef50bd9abb7} - + {4aca2a52-6f01-9ba3-08b0-6b75fd198f9a} - + {4b9b6627-aaa4-9beb-b6a3-3eddd01788cb} - + {8c37558a-961a-474f-b86a-7709d84b20af} - + {99ce0b68-8bc4-6a39-ff20-d9cbb771516e} - + {017d7dc8-bf13-32e1-ff5a-8f2124b7226d} - + {babd1bbf-1c5a-9f6c-f3ee-1db4b6e5b1f6} - + {f85415a0-97b2-6b19-4e61-e4d5b0813084} - + {f5fbfd59-3c8f-a017-be56-5b698c55e8f8} - + {07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6} - + {5716a271-a36f-abb0-bdfd-776fd2fa1a41} - + {b8aa38a8-c1f9-7c27-270f-199d0891282c} - + {e94d4110-703a-d378-de0d-1567557a63a4} - + {b15878d6-6997-adc9-ac65-516a7f578db2} - + {69919814-af57-8c45-e0db-2112ee2a146a} - + {43c5db31-68d1-5452-4bf0-ad0ab84b2e52} - + {13574ed5-427a-5ff2-e79d-092ab3ab24e2} - + {0f11cc16-0734-803c-1c14-7a44fb13c2da} - + {79ae5c41-8c67-f7c0-8693-f259da7c914b} - + {4c5035c1-74ba-cf3d-79b1-471c205a490d} diff --git a/native-builds/libSkiaSharp_uwp/libSkiaSharp_ARM.sln b/native-builds/libSkiaSharp_uwp/libSkiaSharp_ARM.sln index 59ac3c114..f2ff9454e 100644 --- a/native-builds/libSkiaSharp_uwp/libSkiaSharp_ARM.sln +++ b/native-builds/libSkiaSharp_uwp/libSkiaSharp_ARM.sln @@ -3,77 +3,77 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\externals\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\externals\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\externals\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\externals\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\externals\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\externals\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\externals\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\externals\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\externals\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\externals\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\externals\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\externals\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\externals\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\externals\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\externals\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\externals\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\externals\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\externals\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\externals\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\externals\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\externals\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\externals\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\externals\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\externals\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\externals\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\externals\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\externals\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\externals\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\externals\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\externals\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\externals\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\externals\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\externals\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\externals\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/native-builds/libSkiaSharp_uwp/libSkiaSharp_x64.sln b/native-builds/libSkiaSharp_uwp/libSkiaSharp_x64.sln index 559c4aa38..ac2d433e0 100644 --- a/native-builds/libSkiaSharp_uwp/libSkiaSharp_x64.sln +++ b/native-builds/libSkiaSharp_uwp/libSkiaSharp_x64.sln @@ -3,85 +3,85 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\externals\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\externals\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\externals\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\externals\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\externals\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\externals\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\externals\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse42", "..\..\skia\out\gyp\opts_sse42.vcxproj", "{07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse42", "..\..\externals\skia\out\gyp\opts_sse42.vcxproj", "{07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\externals\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\externals\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\externals\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\externals\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\externals\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\externals\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\externals\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\externals\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\externals\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\externals\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\externals\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\externals\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\externals\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\externals\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\externals\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\externals\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\externals\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\externals\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\externals\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\externals\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\externals\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\externals\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\externals\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\externals\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\externals\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\externals\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\externals\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\externals\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\externals\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\externals\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/native-builds/libSkiaSharp_uwp/libSkiaSharp_x86.sln b/native-builds/libSkiaSharp_uwp/libSkiaSharp_x86.sln index 9c68ec8cc..38a4c3b7a 100644 --- a/native-builds/libSkiaSharp_uwp/libSkiaSharp_x86.sln +++ b/native-builds/libSkiaSharp_uwp/libSkiaSharp_x86.sln @@ -3,85 +3,85 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\externals\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\externals\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\externals\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\externals\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\externals\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\externals\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\externals\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse42", "..\..\skia\out\gyp\opts_sse42.vcxproj", "{07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse42", "..\..\externals\skia\out\gyp\opts_sse42.vcxproj", "{07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\externals\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\externals\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\externals\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\externals\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\externals\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\externals\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\externals\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\externals\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\externals\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\externals\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\externals\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\externals\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\externals\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\externals\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\externals\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\externals\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\externals\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\externals\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\externals\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\externals\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\externals\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\externals\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\externals\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\externals\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\externals\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\externals\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\externals\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\externals\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\externals\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\externals\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/native-builds/libSkiaSharp_windows/libSkiaSharp.vcxproj b/native-builds/libSkiaSharp_windows/libSkiaSharp.vcxproj index 9ba2f308b..bff06f33f 100644 --- a/native-builds/libSkiaSharp_windows/libSkiaSharp.vcxproj +++ b/native-builds/libSkiaSharp_windows/libSkiaSharp.vcxproj @@ -24,6 +24,8 @@ libSkiaSharp x64 8.1 + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ @@ -82,9 +84,6 @@ false - - $(SolutionDir)$(Configuration)\ - @@ -93,7 +92,7 @@ Disabled _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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Windows @@ -109,7 +108,7 @@ Disabled _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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Windows @@ -127,7 +126,7 @@ true 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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Windows @@ -147,7 +146,7 @@ true 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) true - ..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\effects;..\..\skia\include\pathops;..\..\skia\include\codec;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories) + ..\..\externals\skia\include\c;..\..\externals\skia\include\config;..\..\externals\skia\include\core;..\..\externals\skia\include\effects;..\..\externals\skia\include\pathops;..\..\externals\skia\include\codec;..\..\externals\skia\include\pathops;..\..\externals\skia\include\pipe;..\..\externals\skia\include\ports;..\..\externals\skia\include\private;..\..\externals\skia\include\utils;..\..\externals\skia\include\images;..\..\externals\skia\src\c;..\..\externals\skia\src\core;..\..\externals\skia\src\sfnt;..\..\externals\skia\src\image;..\..\externals\skia\src\opts;..\..\externals\skia\src\utils;..\..\gyp\config\win;..\..\externals\skia\include\gpu;..\..\externals\skia\src\gpu;%(AdditionalIncludeDirectories) Windows @@ -169,124 +168,124 @@ - + {16f70b29-3f1a-5d36-8fd9-e069d7ed5320} - + {33835bfb-8f8b-4120-2d5c-973a743f30a5} - + {b7760b5e-bfa8-486b-acfd-49e3a6de8e76} - + {3e562996-8671-6cac-3138-dde7dfb70196} - + {e6ac5ad9-ba72-e396-9af0-5bcedee32a44} - + {200809b7-4c62-7592-f47e-bf262809fa50} - + {ba21e9d1-3d2f-7622-2e1f-fbf186ff5677} - + {7f3f1a83-26a1-faf5-c6b1-977e328c1738} - + {31057ac5-dc70-dea7-3e96-9c6fa063245e} - + {a3bcdeca-94f5-1729-484e-180b50c89ad6} - + {6137ced9-8009-c4c3-7a63-4a524a1cdbc8} - + {bf42c422-f0ea-bd6c-5e01-abf4694803b5} - + {244a967d-9ede-f233-1cfa-a22a1b666a3e} - + {35bbcd7a-909d-957f-ada0-c09939e0916f} - + {c984027d-7bfe-3d92-8d87-082486d7334e} - + {f928143d-140d-ed62-0598-451d0e6cca74} - + {96b0bb48-4ede-1509-254e-8f8261eade2c} - + {b6991969-ed48-fd8c-9059-7ef50bd9abb7} - + {4aca2a52-6f01-9ba3-08b0-6b75fd198f9a} - + {4b9b6627-aaa4-9beb-b6a3-3eddd01788cb} - + {8c37558a-961a-474f-b86a-7709d84b20af} - + {99ce0b68-8bc4-6a39-ff20-d9cbb771516e} - + {017d7dc8-bf13-32e1-ff5a-8f2124b7226d} - + {babd1bbf-1c5a-9f6c-f3ee-1db4b6e5b1f6} - + {f85415a0-97b2-6b19-4e61-e4d5b0813084} - + {f5fbfd59-3c8f-a017-be56-5b698c55e8f8} - + {07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6} - + {5716a271-a36f-abb0-bdfd-776fd2fa1a41} - + {b8aa38a8-c1f9-7c27-270f-199d0891282c} - + {c580210b-778a-c16c-6ee0-29eac48e75c7} - + {e94d4110-703a-d378-de0d-1567557a63a4} - + {b15878d6-6997-adc9-ac65-516a7f578db2} - + {69919814-af57-8c45-e0db-2112ee2a146a} - + {43c5db31-68d1-5452-4bf0-ad0ab84b2e52} - + {c06fb60b-8a24-163d-da86-4fad07f1771f} - + {13574ed5-427a-5ff2-e79d-092ab3ab24e2} - + {70a43075-f008-e167-05c8-978be66fe588} - + {0f11cc16-0734-803c-1c14-7a44fb13c2da} - + {79ae5c41-8c67-f7c0-8693-f259da7c914b} - + {4c5035c1-74ba-cf3d-79b1-471c205a490d} diff --git a/native-builds/libSkiaSharp_windows/libSkiaSharp_x64.sln b/native-builds/libSkiaSharp_windows/libSkiaSharp_x64.sln index 60bf13596..1e158c03b 100644 --- a/native-builds/libSkiaSharp_windows/libSkiaSharp_x64.sln +++ b/native-builds/libSkiaSharp_windows/libSkiaSharp_x64.sln @@ -2,89 +2,89 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\externals\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{22B9B540-CC67-43B3-9341-336DEA7FC0EB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\externals\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\externals\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\externals\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\externals\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\externals\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\externals\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\externals\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse42", "..\..\skia\out\gyp\opts_sse42.vcxproj", "{07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse42", "..\..\externals\skia\out\gyp\opts_sse42.vcxproj", "{07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\externals\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\externals\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\externals\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\externals\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\externals\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\externals\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\externals\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\externals\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\externals\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\externals\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\externals\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\externals\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\externals\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\externals\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\externals\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\externals\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\externals\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfntly", "..\..\skia\out\gyp\sfntly.vcxproj", "{C06FB60B-8A24-163D-DA86-4FAD07F1771F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfntly", "..\..\externals\skia\out\gyp\sfntly.vcxproj", "{C06FB60B-8A24-163D-DA86-4FAD07F1771F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\externals\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\..\skia\out\gyp\icuuc.vcxproj", "{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\..\externals\skia\out\gyp\icuuc.vcxproj", "{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\externals\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\externals\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\externals\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\externals\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\externals\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\externals\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\externals\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\externals\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\externals\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\externals\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\externals\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/native-builds/libSkiaSharp_windows/libSkiaSharp_x86.sln b/native-builds/libSkiaSharp_windows/libSkiaSharp_x86.sln index 89d132896..601150735 100644 --- a/native-builds/libSkiaSharp_windows/libSkiaSharp_x86.sln +++ b/native-builds/libSkiaSharp_windows/libSkiaSharp_x86.sln @@ -2,89 +2,89 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\externals\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkiaSharp", "libSkiaSharp.vcxproj", "{22B9B540-CC67-43B3-9341-336DEA7FC0EB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\externals\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\externals\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\externals\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\externals\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\externals\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\externals\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\externals\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse42", "..\..\skia\out\gyp\opts_sse42.vcxproj", "{07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse42", "..\..\externals\skia\out\gyp\opts_sse42.vcxproj", "{07AC9FAE-1C48-1B2C-7A5A-4F43B91C89B6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\externals\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\externals\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\externals\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\externals\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\externals\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\externals\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\externals\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\externals\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\externals\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\externals\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\externals\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\externals\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\externals\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\externals\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\externals\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\externals\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\externals\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfntly", "..\..\skia\out\gyp\sfntly.vcxproj", "{C06FB60B-8A24-163D-DA86-4FAD07F1771F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfntly", "..\..\externals\skia\out\gyp\sfntly.vcxproj", "{C06FB60B-8A24-163D-DA86-4FAD07F1771F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\externals\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\..\skia\out\gyp\icuuc.vcxproj", "{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\..\externals\skia\out\gyp\icuuc.vcxproj", "{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\externals\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\externals\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\externals\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\externals\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\externals\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\externals\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_codec", "..\..\externals\skia\out\gyp\raw_codec.vcxproj", "{69919814-AF57-8C45-E0DB-2112EE2A146A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk", "..\..\externals\skia\out\gyp\dng_sdk.vcxproj", "{E6AC5AD9-BA72-E396-9AF0-5BCEDEE32A44}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dng_sdk-selector", "..\..\externals\skia\out\gyp\dng_sdk-selector.vcxproj", "{3E562996-8671-6CAC-3138-DDE7DFB70196}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex", "..\..\externals\skia\out\gyp\piex.vcxproj", "{E94D4110-703A-D378-DE0D-1567557A63A4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "piex-selector", "..\..\externals\skia\out\gyp\piex-selector.vcxproj", "{C580210B-778A-C16C-6EE0-29EAC48E75C7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Interop.UWP/SkiaSharp.Views.Interop.UWP.vcxproj b/source/SkiaSharp.Views/SkiaSharp.Views.Interop.UWP/SkiaSharp.Views.Interop.UWP.vcxproj index 50ec9b75a..8243f2969 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Interop.UWP/SkiaSharp.Views.Interop.UWP.vcxproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Interop.UWP/SkiaSharp.Views.Interop.UWP.vcxproj @@ -37,6 +37,10 @@ 10.0.10586.0 10.0.10240.0 10.0 + false + $(ProjectDir)\bin\$(Platform)\$(Configuration)\ + $(ProjectDir)\obj\$(Platform)\$(Configuration)\ + $(ProjectName) @@ -96,43 +100,6 @@ - - - false - $(ProjectDir)\bin\$(Platform)\$(Configuration)\ - $(ProjectDir)\obj\$(Platform)\$(Configuration)\ - $(ProjectName) - - - false - $(ProjectDir)\bin\$(Platform)\$(Configuration)\ - $(ProjectDir)\obj\$(Platform)\$(Configuration)\ - $(ProjectName) - - - false - $(ProjectDir)\bin\$(Platform)\$(Configuration)\ - $(ProjectDir)\obj\$(Platform)\$(Configuration)\ - $(ProjectName) - - - false - $(ProjectDir)\bin\$(Platform)\$(Configuration)\ - $(ProjectDir)\obj\$(Platform)\$(Configuration)\ - $(ProjectName) - - - false - $(ProjectDir)\bin\$(Platform)\$(Configuration)\ - $(ProjectDir)\obj\$(Platform)\$(Configuration)\ - $(ProjectName) - - - false - $(ProjectDir)\bin\$(Platform)\$(Configuration)\ - $(ProjectDir)\obj\$(Platform)\$(Configuration)\ - $(ProjectName) - NotUsing