Visual Studio builds: Generate a generic cairo-win32.pc

This is needed so that gtk+-3.0.pc will be complete.

4 files changed, 16 insertions, 5 deletions

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
     </GIDoInstall>
-    <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc</GIPCFiles>
+    <GIPCFiles>..\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</GIPCFiles>
     <GIGenPC>$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPC>
     <GIGenPCX64>$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPCX64>
   </PropertyGroup>
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"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Release|Win32">
@@ -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"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Debug|x64">
@@ -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"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Release|x64">
@@ -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"
 					/>
 				</FileConfiguration>
 			</File>
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&#x0D;&#x0A;
 copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
 copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
 copy ..\cairo.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
+copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
 copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
 copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
 copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;