diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 34876f41a3..25f228900d 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -37,6 +37,7 @@ EXTRA_DIST += \
gtk-update-icon-cache.vcxproj \
gtk-update-icon-cache.vcxproj.filters \
gtk-install.vcxproj \
+ gtk-install.vcxproj.filters \
$(GENERATED_ITEMS)
MSVC_INTERMEDIATE_FILES = gdk-win32.vs10.headers gdk.vs10.headers gtk.vs10.headers gailutil.vs10.headers
diff --git a/build/win32/vs10/gtk-install.propsin b/build/win32/vs10/gtk-install.propsin
index cf1a95aa4e..910218c9ee 100644
--- a/build/win32/vs10/gtk-install.propsin
+++ b/build/win32/vs10/gtk-install.propsin
@@ -60,7 +60,16 @@ mkdir $(CopyDir)\share\themes\Raleigh\gtk-2.0
copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-2.0\gtkrc
if exist $(CopyDir)\share\icons\hicolor $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
+
+mkdir $(CopyDir)\lib\pkgconfig
+copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-2.0.pc
+copy "..\gtk+-2.0.pc" "$(CopyDir)\lib\pkgconfig"
+copy "..\gtk+-2.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-2.0.pc"
+ $(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)
+ $(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)
+ $(SolutionDir)\..\gdk-2.0.pc;$(SolutionDir)\..\gtk+-2.0.pc;$(SolutionDir)\..\gail.pc
<_PropertySheetDisplayName>gtkinstallprops
@@ -78,5 +87,14 @@ if exist $(CopyDir)\share\icons\hicolor $(CopyDir)\bin\gtk-update-icon-cache.exe
$(GtkDoInstall)
+
+ $(GenerateGtkPC)
+
+
+ $(GenerateGtkPCX64)
+
+
+ $(GtkPCFiles)
+
diff --git a/build/win32/vs10/gtk-install.vcxproj b/build/win32/vs10/gtk-install.vcxproj
index bcd0775b33..e90fcfb1b0 100644
--- a/build/win32/vs10/gtk-install.vcxproj
+++ b/build/win32/vs10/gtk-install.vcxproj
@@ -88,16 +88,34 @@
Installing Build Results...
$(GtkDoInstall)
- $(InstalledDlls);$(InstalledBins);%(Outputs)
+ blah;%(Outputs)
+ $(GtkPCFiles)
Installing Build Results...
$(GtkDoInstall)
- $(InstalledDlls);$(InstalledBins);%(Outputs)
+ blah;%(Outputs)
+ $(GtkPCFiles)
Installing Build Results...
$(GtkDoInstall)
- $(InstalledDlls);$(InstalledBins);%(Outputs)
+ blah;%(Outputs)
+ $(GtkPCFiles)
Installing Build Results...
$(GtkDoInstall)
- $(InstalledDlls);$(InstalledBins);%(Outputs)
+ blah;%(Outputs)
+ $(GtkPCFiles)
+
+
+ Generating .pc files...
+ $(GenerateGtkPC)
+ $(GtkPCFiles);%(Outputs)
+ Generating .pc files...
+ $(GenerateGtkPC)
+ $(GtkPCFiles);%(Outputs)
+ Generating .pc files...
+ $(GenerateGtkPCX64)
+ $(GtkPCFiles);%(Outputs)
+ Generating .pc files...
+ $(GenerateGtkPCX64)
+ $(GtkPCFiles);%(Outputs)
diff --git a/build/win32/vs10/gtk-install.vcxproj.filters b/build/win32/vs10/gtk-install.vcxproj.filters
new file mode 100644
index 0000000000..21bc9a4611
--- /dev/null
+++ b/build/win32/vs10/gtk-install.vcxproj.filters
@@ -0,0 +1,13 @@
+
+
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav
+
+
+
+ Resource Files
+ Resource Files
+
+
diff --git a/build/win32/vs10/gtk-version-paths.props b/build/win32/vs10/gtk-version-paths.props.in
similarity index 77%
rename from build/win32/vs10/gtk-version-paths.props
rename to build/win32/vs10/gtk-version-paths.props.in
index 7d8f5e95fb..fa40382433 100644
--- a/build/win32/vs10/gtk-version-paths.props
+++ b/build/win32/vs10/gtk-version-paths.props.in
@@ -6,12 +6,18 @@
$(GlibEtcInstallRoot)
$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)
2.0
+ @GTK_VERSION@
lib
-$(ApiVersion)-0
-2-vs$(VSVer)
+
$(GtkSeparateVSDllPrefix)
$(GtkSeparateVSDllSuffix)
+
+ c:\python34
+ $(PythonPath).x64
<_PropertySheetDisplayName>gtkversionpathsprops
@@ -32,6 +38,9 @@
$(ApiVersion)
+
+ $(GtkVersion)
+
$(GtkLibtoolCompatibleDllPrefix)
@@ -50,5 +59,10 @@
$(GtkDllSuffix)
+
+ $(PythonPath)
+
+
+ $(PythonPathX64)
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
index 44711fa0d6..e6cac32ce0 100644
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -21,7 +21,8 @@ EXTRA_DIST += \
libwimp.vcxproj.filters \
gtk-update-icon-cache.vcxproj \
gtk-update-icon-cache.vcxproj.filters \
- gtk-install.vcxproj
+ gtk-install.vcxproj \
+ gtk-install.vcxproj.filters
DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index bb87a88838..238457d7b4 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -21,7 +21,8 @@ EXTRA_DIST += \
libwimp.vcxproj.filters \
gtk-update-icon-cache.vcxproj \
gtk-update-icon-cache.vcxproj.filters \
- gtk-install.vcxproj
+ gtk-install.vcxproj \
+ gtk-install.vcxproj.filters
DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index 147d3cd902..c70c343b6b 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -21,7 +21,8 @@ EXTRA_DIST += \
libwimp.vcxproj.filters \
gtk-update-icon-cache.vcxproj \
gtk-update-icon-cache.vcxproj.filters \
- gtk-install.vcxproj
+ gtk-install.vcxproj \
+ gtk-install.vcxproj.filters
DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/build/win32/vs9/gtk-install.vcproj b/build/win32/vs9/gtk-install.vcproj
index 2396b9a61a..8b06de93d4 100644
--- a/build/win32/vs9/gtk-install.vcproj
+++ b/build/win32/vs9/gtk-install.vcproj
@@ -28,7 +28,7 @@
DeleteExtensionsOnClean=""
>
@@ -41,7 +41,7 @@
DeleteExtensionsOnClean=""
>
@@ -55,7 +55,7 @@
DeleteExtensionsOnClean=""
>
@@ -69,9 +69,47 @@
DeleteExtensionsOnClean=""
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/win32/vs9/gtk-install.vspropsin b/build/win32/vs9/gtk-install.vspropsin
index 4d1041f25c..8da8207939 100644
--- a/build/win32/vs9/gtk-install.vspropsin
+++ b/build/win32/vs9/gtk-install.vspropsin
@@ -61,6 +61,20 @@ mkdir $(CopyDir)\share\themes\Raleigh\gtk-$(ApiVersion)
copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-$(ApiVersion)\gtkrc
if exist $(CopyDir)\share\icons\hicolor $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
+
+mkdir $(CopyDir)\lib\pkgconfig
+copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig
+copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-2.0.pc
+copy "..\gtk+-2.0.pc" "$(CopyDir)\lib\pkgconfig"
+copy "..\gtk+-2.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-2.0.pc"
"
/>
+
+
diff --git a/build/win32/vs9/gtk-version-paths.vsprops b/build/win32/vs9/gtk-version-paths.vsprops.in
similarity index 79%
rename from build/win32/vs9/gtk-version-paths.vsprops
rename to build/win32/vs9/gtk-version-paths.vsprops.in
index 910c4d8859..65f6b0dad2 100644
--- a/build/win32/vs9/gtk-version-paths.vsprops
+++ b/build/win32/vs9/gtk-version-paths.vsprops.in
@@ -24,6 +24,10 @@
Name="ApiVersion"
Value="2.0"
/>
+
+
+
+
diff --git a/configure.ac b/configure.ac
index 4e11b4027b..9b7151aeee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1741,7 +1741,9 @@ docs/tutorial/Makefile
build/Makefile
build/win32/Makefile
build/win32/vs9/Makefile
+build/win32/vs9/gtk-version-paths.vsprops
build/win32/vs10/Makefile
+build/win32/vs10/gtk-version-paths.props
build/win32/vs11/Makefile
build/win32/vs12/Makefile
build/win32/vs14/Makefile