Commit d654a92e authored by Erwin Janssen's avatar Erwin Janssen

Update Cairo and Pango dependencies for Windows

Update the libraries and dependencies for Cairo, Pango and Pangocairo to
the latest version available, both for x86 and x64. This also eliminates
the need for the pangomodules.exe to be called.
parent cfb56b36
This diff is collapsed.
......@@ -67,16 +67,14 @@
<SubSystem>Windows</SubSystem>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>cgraph.lib;libpng12.lib;libgd.lib;libcairo-2.lib;fontconfig.lib;gvc.lib;freetype.lib;iconv.lib;jpeg.lib;zlib.lib;pathplan.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>cgraph.lib;libgd.lib;gvc.lib;pathplan.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgd.dll $(OutDir)libgd.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll</Command>
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\cairo.dll $(OutDir)cairo.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)expat.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\fontconfig.dll $(OutDir)fontconfig.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pixman-1.dll $(OutDir)pixman-1.dll</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -96,16 +94,14 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)ico
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>cgraph.lib;libpng12.lib;libgd.lib;libcairo-2.lib;fontconfig.lib;gvc.lib;freetype.lib;iconv.lib;jpeg.lib;zlib.lib;pathplan.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>cgraph.lib;libgd.lib;gvc.lib;pathplan.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgd.dll $(OutDir)libgd.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll</Command>
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\cairo.dll $(OutDir)cairo.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)expat.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\fontconfig.dll $(OutDir)fontconfig.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pixman-1.dll $(OutDir)pixman-1.dll</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
......@@ -125,4 +121,4 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)ico
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
......@@ -67,26 +67,20 @@
<SubSystem>Windows</SubSystem>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>gvc.lib;glib-2.0.lib;pango-1.0.lib;pangocairo-1.0.lib;libcairo-2.lib;gobject-2.0.lib;cgraph.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>cgraph.lib;gvc.lib;cairo.lib;glib-2.0.lib;pango-1.0.lib;pangocairo-1.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\intl.dll $(OutDir)intl.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll
xcopy /E $(SolutionDir)windows\dependencies\libraries\x86\lib\pango $(OutDir)..\lib\pango\
if not exist "$(OutDir)..\etc\pango\" mkdir $(OutDir)..\etc\pango\
$(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe &gt; $(OutDir)..\etc\pango\pango.modules</Command>
<Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\cairo.dll $(OutDir)cairo.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)expat.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\fontconfig.dll $(OutDir)fontconfig.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\glib-2.dll $(OutDir)glib-2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\gobject-2.dll $(OutDir)gobject-2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libharfbuzz-0.dll $(OutDir)libharfbuzz-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-1.dll $(OutDir)pango-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pangocairo-1.dll $(OutDir)pangocairo-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pangoft2-1.dll $(OutDir)pango2-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pangowin32-1.dll $(OutDir)pangowin32-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pixman-1.dll $(OutDir)pixman-1.dll</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -105,26 +99,20 @@ $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe &gt;
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>gvc.lib;glib-2.0.lib;pango-1.0.lib;pangocairo-1.0.lib;libcairo-2.lib;gobject-2.0.lib;cgraph.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>cgraph.lib;gvc.lib;cairo.lib;glib-2.0.lib;pango-1.0.lib;pangocairo-1.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libcairo-2.dll $(OutDir)libcairo-2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfontconfig-1.dll $(OutDir)libfontconfig-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libfreetype-6.dll $(OutDir)libfreetype-6.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpng12.dll $(OutDir)libpng12.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libxml2.dll $(OutDir)libxml2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\iconv.dll $(OutDir)iconv.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libglib-2.0-0.dll $(OutDir)libglib-2.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpango-1.0-0.dll $(OutDir)libpango-1.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangocairo-1.0-0.dll $(OutDir)libpangocairo-1.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgobject-2.0-0.dll $(OutDir)libgobject-2.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\intl.dll $(OutDir)intl.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libgmodule-2.0-0.dll $(OutDir)libgmodule-2.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangoft2-1.0-0.dll $(OutDir)libpangoft2-1.0-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libpangowin32-1.0-0.dll $(OutDir)libpangowin32-1.0-0.dll
xcopy /E $(SolutionDir)windows\dependencies\libraries\x86\lib\pango $(OutDir)..\lib\pango\
if not exist "$(OutDir)..\etc\pango\" mkdir $(OutDir)..\etc\pango\
$(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe &gt; $(OutDir)..\etc\pango\pango.modules</Command>
<Command>copy $(SolutionDir)windows\dependencies\libraries\x86\bin\cairo.dll $(OutDir)cairo.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\expat.dll $(OutDir)expat.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\fontconfig.dll $(OutDir)fontconfig.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\glib-2.dll $(OutDir)glib-2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\gobject-2.dll $(OutDir)gobject-2.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\libharfbuzz-0.dll $(OutDir)libharfbuzz-0.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-1.dll $(OutDir)pango-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pangocairo-1.dll $(OutDir)pangocairo-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pangoft2-1.dll $(OutDir)pango2-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pangowin32-1.dll $(OutDir)pangowin32-1.dll
copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pixman-1.dll $(OutDir)pixman-1.dll</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
......@@ -146,4 +134,4 @@ $(SolutionDir)windows\dependencies\libraries\x86\bin\pango-querymodules.exe &gt;
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
Subproject commit a9bf0975011b198ffee28e500ee8699c373477b5
Subproject commit 141d3a21be904fa8dc2ae3ed01d36684db07a35d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment