Visual Studio builds: Generate .pc file

...if the Python interpretor can be found at $(PythonPath) (x86) or
$(PythonPathX64) (x64).  This is done to make introspection builds a bit
easier for packages that depend on GDK-Pixbuf

13 files changed, 361 insertions, 15 deletions

diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 4ce78ec2e..bcc18f204 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -28,8 +28,11 @@ SUBDIRS =	\
 
 EXTRA_DIST =	\
 	detectenv-msvc.mak			\
-	introspection-msvc.mak		\
+	introspection-msvc.mak			\
 	gdk-pixbuf-introspection-msvc.mak	\
+	gdkpixbuf-pc.py				\
+	pc_base.py				\
+	replace.py				\
 	$(GENERATED_ITEMS)
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/gdkpixbuf-pc.py b/build/win32/gdkpixbuf-pc.py
new file mode 100644
index 000000000..6321f6161
--- /dev/null
+++ b/build/win32/gdkpixbuf-pc.py
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+#
+# Utility script to generate .pc files for GDK-Pixbuf
+# for Visual Studio builds, to be used for
+# building introspection files
+
+# Author: Fan, Chun-wei
+# Date: April 22, 2016
+
+import os
+import sys
+import argparse
+
+from replace import replace_multi, replace
+from pc_base import BasePCItems
+
+def main(argv):
+    base_pc = BasePCItems()
+    base_pc.setup(argv)
+    pkg_replace_items = {'@GDK_PIXBUF_API_VERSION@': '2.0',
+                         '@GDK_PIXBUF_BINARY_VERSION@': '2.10.0',
+                         '@PNG_DEP_CFLAGS_PACKAGES@': '',
+                         '@GDK_PIXBUF_EXTRA_LIBS@': '',
+                         '@GDK_PIXBUF_EXTRA_CFLAGS@': ''}
+
+    pkg_replace_items.update(base_pc.base_replace_items)
+
+    # Generate gdk-pixbuf-2.0.pc.tmp to replace the module directory
+    replace_multi(base_pc.top_srcdir + '/gdk-pixbuf-2.0.pc.in',
+                  base_pc.srcdir + '/gdk-pixbuf-2.0.pc.tmp',
+                  pkg_replace_items)
+    replace(base_pc.srcdir + '/gdk-pixbuf-2.0.pc.tmp',
+            base_pc.srcdir + '/gdk-pixbuf-2.0.pc',
+            '${prefix}/lib/gdk-pixbuf',
+            '${exec_prefix}/lib/gdk-pixbuf')
+    os.unlink(base_pc.srcdir + '/gdk-pixbuf-2.0.pc.tmp')
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
diff --git a/build/win32/pc_base.py b/build/win32/pc_base.py
new file mode 100644
index 000000000..da10560a2
--- /dev/null
+++ b/build/win32/pc_base.py
@@ -0,0 +1,108 @@
+#!/usr/bin/python
+#
+# Simple utility script to generate the basic info
+# needed in a .pc (pkg-config) file, used especially
+# for introspection purposes
+
+# This can be used in various projects where
+# there is the need to generate .pc files,
+# and is copied from GLib's $(srcroot)/build/win32
+
+# Author: Fan, Chun-wei
+# Date: March 10, 2016
+
+import os
+import sys
+import argparse
+
+class BasePCItems:
+    def __init__(self):
+        self.base_replace_items = {}
+        self.exec_prefix = ''
+        self.includedir = ''
+        self.libdir = ''
+        self.prefix = ''
+        self.srcdir = os.path.dirname(__file__)
+        self.top_srcdir = self.srcdir + '\\..\\..'
+        self.version = ''
+
+    def setup(self, argv, parser=None):
+        if parser is None:
+            parser = argparse.ArgumentParser(description='Setup basic .pc file info')
+        parser.add_argument('--prefix', help='prefix of the installed library',
+                            required=True)
+        parser.add_argument('--exec-prefix',
+                            help='prefix of the installed programs, \
+                                  if different from the prefix')
+        parser.add_argument('--includedir',
+                            help='includedir of the installed library, \
+                                  if different from ${prefix}/include')
+        parser.add_argument('--libdir',
+                            help='libdir of the installed library, \
+                                  if different from ${prefix}/lib')
+        parser.add_argument('--version', help='Version of the package',
+                            required=True)
+        args = parser.parse_args()
+
+        self.version = args.version
+
+        # check whether the prefix and exec_prefix are valid
+        if not os.path.exists(args.prefix):
+            raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix)
+
+        # check and setup the exec_prefix
+        if getattr(args, 'exec_prefix', None) is None:
+            input_exec_prefix = args.prefix
+        else:
+            input_exec_prefix = args.exec_prefix
+        if not os.path.exists(input_exec_prefix):
+            raise SystemExit('Specified exec-prefix \'%s\' is invalid' %
+                             input_exec_prefix)
+
+
+        # check and setup the includedir
+        if getattr(args, 'includedir', None) is None:
+            self.includedir = '${prefix}/include'
+        else:
+            if args.includedir.startswith('${prefix}'):
+                includedir_use_shorthand = True
+                input_includedir = args.prefix + args.includedir[len('${prefix}'):]
+            else:
+                includedir_use_shorthand = False
+                input_includedir = args.includedir
+            if not os.path.exists(input_includedir):
+                raise SystemExit('Specified includedir \'%s\' is invalid' %
+                                  args.includedir)
+            if includedir_use_shorthand is True:
+                self.includedir = args.includedir.replace('\\','/')
+            else:
+                self.includedir = os.path.abspath(input_includedir).replace('\\','/')
+
+        # check and setup the libdir
+        if getattr(args, 'libdir', None) is None:
+            self.libdir = '${prefix}/lib'
+        else:
+            if args.libdir.startswith('${prefix}'):
+                libdir_use_shorthand = True
+                input_libdir = args.prefix + args.libdir[len('${prefix}'):]
+            else:
+                libdir_use_shorthand = False
+                input_libdir = args.libdir
+            if not os.path.exists(input_libdir):
+                raise SystemExit('Specified libdir \'%s\' is invalid' %
+			                      args.libdir)
+            if libdir_use_shorthand is True:
+                self.libdir = args.libdir.replace('\\','/')
+            else:
+                self.libdir = os.path.abspath(input_libdir).replace('\\','/')
+
+        # use absolute paths for prefix and exec_prefix
+        self.prefix = os.path.abspath(args.prefix).replace('\\','/')
+        self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
+
+        # setup dictionary for replacing items in *.pc.in
+        self.base_replace_items.update({'@VERSION@': self.version})
+        self.base_replace_items.update({'@prefix@': self.prefix})
+        self.base_replace_items.update({'@exec_prefix@': self.exec_prefix})
+        self.base_replace_items.update({'@libdir@': self.libdir})
+        self.base_replace_items.update({'@includedir@': self.includedir})
diff --git a/build/win32/replace.py b/build/win32/replace.py
new file mode 100644
index 000000000..a81bab942
--- /dev/null
+++ b/build/win32/replace.py
@@ -0,0 +1,109 @@
+#!/usr/bin/python
+#
+# Simple utility script to manipulate
+# certain types of strings in a file
+
+# This can be used in various projects where
+# there is the need to replace strings in files,
+# and is copied from GLib's $(srcroot)/build/win32
+
+# Author: Fan, Chun-wei
+# Date: September 03, 2014
+
+import os
+import sys
+import re
+import string
+import argparse
+
+valid_actions = ['remove-prefix',
+                 'replace-var',
+                 'replace-str',
+                 'remove-str']
+
+def replace_multi(src, dest, replace_items):
+    with open(src, 'r') as s:
+        with open(dest, 'w') as d:
+            for line in s:
+                replace_dict = dict((re.escape(key), value) \
+                               for key, value in replace_items.items())
+                replace_pattern = re.compile("|".join(replace_dict.keys()))
+                d.write(replace_pattern.sub(lambda m: \
+                        replace_dict[re.escape(m.group(0))], line))
+
+def replace(src, dest, instring, outstring):
+    replace_item = {instring: outstring}
+    replace_multi(src, dest, replace_item)
+
+def check_required_args(args, params):
+    for param in params:
+        if getattr(args, param, None) is None:
+            raise SystemExit('%s: error: --%s argument is required' % (__file__, param))
+
+def warn_ignored_args(args, params):
+    for param in params:
+        if getattr(args, param, None) is not None:
+            print('%s: warning: --%s argument is ignored' % (__file__, param))
+
+def main(argv):
+
+    parser = argparse.ArgumentParser(description='Process strings in a file.')
+    parser.add_argument('-a',
+                        '--action',
+                        help='Action to carry out.  Can be one of:\n'
+                             'remove-prefix\n'
+                             'replace-var\n'
+                             'replace-str\n'
+                             'remove-str',
+                        choices=valid_actions)
+    parser.add_argument('-i', '--input', help='Input file')
+    parser.add_argument('-o', '--output', help='Output file')
+    parser.add_argument('--instring', help='String to replace or remove')
+    parser.add_argument('--var', help='Autotools variable name to replace')
+    parser.add_argument('--outstring',
+                        help='New String to replace specified string or variable')
+    parser.add_argument('--removeprefix', help='Prefix of string to remove')
+
+    args = parser.parse_args()
+
+    input_string = ''
+    output_string = ''
+
+    # We must have action, input, output for all operations
+    check_required_args(args, ['action','input','output'])
+
+    # Build the arguments by the operation that is to be done,
+    # to be fed into replace()
+
+    # Get rid of prefixes from a string
+    if args.action == 'remove-prefix':
+        check_required_args(args, ['instring','removeprefix'])
+        warn_ignored_args(args, ['outstring','var'])
+        input_string = args.removeprefix + args.instring
+        output_string = args.instring
+
+    # Replace an m4-style variable (those surrounded by @...@)
+    if args.action == 'replace-var':
+        check_required_args(args, ['var','outstring'])
+        warn_ignored_args(args, ['instring','removeprefix'])
+        input_string = '@' + args.var + '@'
+        output_string = args.outstring
+
+    # Replace a string
+    if args.action == 'replace-str':
+        check_required_args(args, ['instring','outstring'])
+        warn_ignored_args(args, ['var','removeprefix'])
+        input_string = args.instring
+        output_string = args.outstring
+
+    # Remove a string
+    if args.action == 'remove-str':
+        check_required_args(args, ['instring'])
+        warn_ignored_args(args, ['var','outstring','removeprefix'])
+        input_string = args.instring
+        output_string = ''
+
+    replace(args.input, args.output, input_string, output_string)
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index d25fb7596..0ad545997 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -19,6 +19,7 @@ EXTRA_DIST = \
 	gdk-pixbuf-pixdata.vcxproj	\
 	gdk-pixbuf-pixdata.vcxproj.filters	\
 	gdk-pixbuf-install.vcxproj	\
+	gdk-pixbuf-install.vcxproj.filters	\
 	$(GENERATED_ITEMS)		\
 	math.h
 
diff --git a/build/win32/vs10/gdk-pixbuf-install.propsin b/build/win32/vs10/gdk-pixbuf-install.propsin
index 3b99510c4..1abc6f874 100644
--- a/build/win32/vs10/gdk-pixbuf-install.propsin
+++ b/build/win32/vs10/gdk-pixbuf-install.propsin
@@ -5,8 +5,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <InstalledDlls>$(BinDir)\$(GdkPixbufDllPrefix)gdk_pixbuf(GdkPixbufDllSuffix).dll</InstalledDlls>
-    <InstalledBins>$(BinDir)\gdk-pixbuf-csource.exe;$(BinDir)\gdk-pixbuf-pixdata.exe;$(BinDir)\gdk-pixbuf-query-loaders.exe</InstalledBins>
     <GdkPixbufDoInstall>
 echo on
 
@@ -21,7 +19,12 @@ copy $(BinDir)\gdk_pixbuf-$(ApiVersion).lib $(CopyDir)\lib
 
 mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
 #include "gdk-pixbuf.vs10.headers"
+
+if exist ..\gdk-pixbuf-2.0.pc (mkdir $(CopyDir)\lib\pkgconfig &amp; copy ..\gdk-pixbuf-2.0.pc $(CopyDir)\lib\pkgconfig)
     </GdkPixbufDoInstall>
+    <GenGdkPixbufPC>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gdkpixbuf-pc.py --version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)</GenGdkPixbufPC>
+    <GenGdkPixbufPCX64>if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python.exe ..\gdkpixbuf-pc.py --version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)</GenGdkPixbufPCX64>
+    <GdkPixbufPCFiles>..\gdk-pixbuf-2.0.pc</GdkPixbufPCFiles>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gdk-pixbufinstallprops</_PropertySheetDisplayName>
@@ -30,14 +33,17 @@ mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
     <BuildMacro Include="BinDir">
       <Value>$(BinDir)</Value>
     </BuildMacro>
-    <BuildMacro Include="InstalledDlls">
-      <Value>$(InstalledDlls)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledBins">
-      <Value>$(InstalledBins)</Value>
-    </BuildMacro>
     <BuildMacro Include="GdkPixbufDoInstall">
       <Value>$(GdkPixbufDoInstall)</Value>
     </BuildMacro>
+    <BuildMacro Include="GenGdkPixbufPC">
+      <Value>$(GenGdkPixbufPC)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenGdkPixbufPCX64">
+      <Value>$(GenGdkPixbufPCX64)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkPixbufPCFiles">
+      <Value>$(GdkPixbufPCFiles)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk-pixbuf-install.vcxproj b/build/win32/vs10/gdk-pixbuf-install.vcxproj
index 5f5497703..518891416 100644
--- a/build/win32/vs10/gdk-pixbuf-install.vcxproj
+++ b/build/win32/vs10/gdk-pixbuf-install.vcxproj
@@ -87,17 +87,35 @@
   <ItemGroup>
     <CustomBuild Include="..\..\..\config.h.win32">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufPCFiles)</AdditionalInputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GdkPixbufPCFiles)</AdditionalInputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GdkPixbufPCFiles)</AdditionalInputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GdkPixbufPCFiles)</AdditionalInputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\gdk-pixbuf-2.0.pc.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGdkPixbufPC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGdkPixbufPCX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGdkPixbufPC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGdkPixbufPCX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs10/gdk-pixbuf-install.vcxproj.filters b/build/win32/vs10/gdk-pixbuf-install.vcxproj.filters
new file mode 100644
index 000000000..8fd9d6a39
--- /dev/null
+++ b/build/win32/vs10/gdk-pixbuf-install.vcxproj.filters
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\gdk-pixbuf-2.0.pc.in"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
+</Project>
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index 282b4f1f1..7c9d719df 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = \
 	gdk-pixbuf-pixdata.vcxproj	\
 	gdk-pixbuf-pixdata.vcxproj.filters	\
 	gdk-pixbuf-install.vcxproj	\
+	gdk-pixbuf-install.vcxproj.filters	\
 	math.h
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 8bf3f47ac..847a21058 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -13,7 +13,8 @@ EXTRA_DIST = \
 	gdk-pixbuf-query-loaders.vcxproj.filters	 \
 	gdk-pixbuf-pixdata.vcxproj      \
 	gdk-pixbuf-pixdata.vcxproj.filters      \
-	gdk-pixbuf-install.vcxproj
+	gdk-pixbuf-install.vcxproj		\
+	gdk-pixbuf-install.vcxproj.filters
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index 2a08c2646..41ca45817 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -13,7 +13,8 @@ EXTRA_DIST = \
 	gdk-pixbuf-query-loaders.vcxproj.filters	 \
 	gdk-pixbuf-pixdata.vcxproj      \
 	gdk-pixbuf-pixdata.vcxproj.filters      \
-	gdk-pixbuf-install.vcxproj
+	gdk-pixbuf-install.vcxproj		\
+	gdk-pixbuf-install.vcxproj.filters
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
diff --git a/build/win32/vs9/gdk-pixbuf-install.vcproj b/build/win32/vs9/gdk-pixbuf-install.vcproj
index 3707efc78..b4c722f79 100644
--- a/build/win32/vs9/gdk-pixbuf-install.vcproj
+++ b/build/win32/vs9/gdk-pixbuf-install.vcproj
@@ -77,6 +77,42 @@
 	<References>
 	</References>
 	<Files>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File RelativePath="..\..\..\gdk-pixbuf-2.0.pc.in">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating .pc files..."
+						CommandLine="$(GenGdkPixbufPC)"
+						Outputs="..\gdk-pixbuf-2.0.pc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating .pc files..."
+						CommandLine="$(GenGdkPixbufPC)"
+						Outputs="..\gdk-pixbuf-2.0.pc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating .pc files..."
+						CommandLine="$(GenGdkPixbufPCX64)"
+						Outputs="..\gdk-pixbuf-2.0.pc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating .pc files..."
+						CommandLine="$(GenGdkPixbufPCX64)"
+						Outputs="..\gdk-pixbuf-2.0.pc"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/build/win32/vs9/gdk-pixbuf-install.vspropsin b/build/win32/vs9/gdk-pixbuf-install.vspropsin
index 8d0e1188f..119600eea 100644
--- a/build/win32/vs9/gdk-pixbuf-install.vspropsin
+++ b/build/win32/vs9/gdk-pixbuf-install.vspropsin
@@ -19,6 +19,16 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gdk_pixbuf-$(ApiVersion).lib $(Cop
 
 mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
 #include "gdk-pixbuf.headers"
+
+if exist ..\gdk-pixbuf-$(ApiVersion).pc (mkdir $(CopyDir)\lib\pkgconfig &amp; copy ..\gdk-pixbuf-$(ApiVersion).pc $(CopyDir)\lib\pkgconfig)&#x0D;&#x0A;
 "
 	/>
+	<UserMacro
+		Name="GenGdkPixbufPC"
+		Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gdkpixbuf-pc.py --version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)"
+	/>
+	<UserMacro
+		Name="GenGdkPixbufPCX64"
+		Value="if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python.exe ..\gdkpixbuf-pc.py --version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)"
+	/>
 </VisualStudioPropertySheet>