From 5b8b6cf2a48f464b2cc5dc7d91a556c70b3c1999 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 25 Apr 2016 17:14:21 +0800 Subject: Visual Studio builds: Generate a generic cairo-win32.pc This is needed so that gtk+-3.0.pc will be complete. --- build/win32/gipc.py | 9 +++++++++ build/win32/vs10/gi-install.propsin | 3 ++- build/win32/vs9/gi-install.vcproj | 8 ++++---- build/win32/vs9/gi-install.vspropsin | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) (limited to 'build') diff --git a/build/win32/gipc.py b/build/win32/gipc.py index 16eba1fc..9fd066c8 100644 --- a/build/win32/gipc.py +++ b/build/win32/gipc.py @@ -54,6 +54,15 @@ def main(argv): cairo_pc.write('Cflags: -I${includedir}\n') cairo_pc.close() + # Generate a generic .pc file for Cairo-Win32, that is just sufficient for our + # purposes + # Just make a copy of the cairo.pc we just generated and replace the items as needed + cairo_win32_replace_items = \ + {'generic cairo pkg-config file': 'generic cairo-win32 pkg-config file'} + replace_multi(base_pc.srcdir + '/cairo.pc', + base_pc.srcdir + '/cairo-win32.pc', + cairo_win32_replace_items) + # Generate a generic .pc file for Cairo-GObject, that is just sufficient for our # purposes # Just make a copy of the cairo.pc we just generated and replace the items as needed diff --git a/build/win32/vs10/gi-install.propsin b/build/win32/vs10/gi-install.propsin index 95aa7462..a8b53f96 100644 --- a/build/win32/vs10/gi-install.propsin +++ b/build/win32/vs10/gi-install.propsin @@ -74,11 +74,12 @@ mkdir $(CopyDir)\lib\pkgconfig copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig copy ..\cairo.pc $(CopyDir)\lib\pkgconfig +copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig - ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc + ..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc $(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir) $(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir) diff --git a/build/win32/vs9/gi-install.vcproj b/build/win32/vs9/gi-install.vcproj index 8625b5e7..5fd191c1 100644 --- a/build/win32/vs9/gi-install.vcproj +++ b/build/win32/vs9/gi-install.vcproj @@ -86,7 +86,7 @@ Name="VCCustomBuildTool" Description="Generating .pc files..." CommandLine="$(GIGenPC)" - Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc" + Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc" /> @@ -94,7 +94,7 @@ Name="VCCustomBuildTool" Description="Generating .pc files..." CommandLine="$(GIGenPC)" - Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc" + Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc" /> @@ -102,7 +102,7 @@ Name="VCCustomBuildTool" Description="Generating .pc files..." CommandLine="$(GIGenPCX64)" - Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc" + Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc" /> @@ -110,7 +110,7 @@ Name="VCCustomBuildTool" Description="Generating .pc files..." CommandLine="$(GIGenPCX64)" - Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc" + Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc" /> diff --git a/build/win32/vs9/gi-install.vspropsin b/build/win32/vs9/gi-install.vspropsin index 9a2ac9ed..c1706e92 100644 --- a/build/win32/vs9/gi-install.vspropsin +++ b/build/win32/vs9/gi-install.vspropsin @@ -76,6 +76,7 @@ mkdir $(CopyDir)\lib\pkgconfig copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig copy ..\cairo.pc $(CopyDir)\lib\pkgconfig +copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig -- cgit v1.2.1