Browse Source

Remove cairo libs.

Rely on having GtkSharp installed.
pull/10/head
Steven Kirk 12 years ago
parent
commit
0202b55289
  1. 3
      Cairo/Perspex.Cairo/CairoPlatform.cs
  2. 31
      Cairo/Perspex.Cairo/Perspex.Cairo.csproj
  3. BIN
      Cairo/Perspex.Cairo/libcairo-2.dll
  4. BIN
      Cairo/Perspex.Cairo/libfontconfig-1.dll
  5. BIN
      Cairo/Perspex.Cairo/libfreetype-6.dll
  6. BIN
      Cairo/Perspex.Cairo/libiconv-2.dll
  7. BIN
      Cairo/Perspex.Cairo/liblzma-5.dll
  8. BIN
      Cairo/Perspex.Cairo/libpixman-1-0.dll
  9. BIN
      Cairo/Perspex.Cairo/libpng15-15.dll
  10. BIN
      Cairo/Perspex.Cairo/libxml2-2.dll
  11. BIN
      Dependencies/Mono.Cairo.dll
  12. 2
      TestApplication/TestApplication.csproj

3
Cairo/Perspex.Cairo/CairoPlatform.cs

@ -25,9 +25,6 @@ namespace Perspex.Cairo
var locator = Locator.CurrentMutable;
locator.Register(() => instance, typeof(IPlatformRenderInterface));
locator.Register(() => textService, typeof(ITextService));
//locator.Register(() => d2d1Factory, typeof(SharpDX.Direct2D1.Factory));
//locator.Register(() => dwFactory, typeof(SharpDX.DirectWrite.Factory));
//locator.Register(() => imagingFactory, typeof(SharpDX.WIC.ImagingFactory));
}
public ITextService TextService

31
Cairo/Perspex.Cairo/Perspex.Cairo.csproj

@ -30,9 +30,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cairo">
<HintPath>..\..\Dependencies\Mono.Cairo.dll</HintPath>
</Reference>
<Reference Include="Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL" />
<Reference Include="Splat">
<HintPath>..\..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference>
@ -73,32 +72,6 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Content Include="libcairo-2.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="libfontconfig-1.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="libfreetype-6.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="libiconv-2.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="liblzma-5.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="libpixman-1-0.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="libpng15-15.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="libxml2-2.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

BIN
Cairo/Perspex.Cairo/libcairo-2.dll

Binary file not shown.

BIN
Cairo/Perspex.Cairo/libfontconfig-1.dll

Binary file not shown.

BIN
Cairo/Perspex.Cairo/libfreetype-6.dll

Binary file not shown.

BIN
Cairo/Perspex.Cairo/libiconv-2.dll

Binary file not shown.

BIN
Cairo/Perspex.Cairo/liblzma-5.dll

Binary file not shown.

BIN
Cairo/Perspex.Cairo/libpixman-1-0.dll

Binary file not shown.

BIN
Cairo/Perspex.Cairo/libpng15-15.dll

Binary file not shown.

BIN
Cairo/Perspex.Cairo/libxml2-2.dll

Binary file not shown.

BIN
Dependencies/Mono.Cairo.dll

Binary file not shown.

2
TestApplication/TestApplication.csproj

@ -22,7 +22,7 @@
<DefineConstants>TRACE;DEBUG;PERSPEX_CAIRO</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>

Loading…
Cancel
Save