diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk3-install.propsin index 491375647f..7221413c6f 100644 --- a/build/win32/vs10/gtk3-install.propsin +++ b/build/win32/vs10/gtk3-install.propsin @@ -127,18 +127,19 @@ copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas - -echo "Compiling gsettings XML Files..." -$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas - -echo "Generating icon cache......" -$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor" copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway #include "gdk3-broadway.vs10.headers" + +echo "Compiling gsettings XML Files..." +$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas + +echo "Generating icon cache......" +$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor" + $(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) ..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc @@ -168,6 +169,9 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway $(GtkDoInstallBroadwayHeaders) + + $(GtkPostInstall) + $(GenerateGtkPC) diff --git a/build/win32/vs10/gtk3-install.vcxproj b/build/win32/vs10/gtk3-install.vcxproj index cb772eb1f3..5ddf92a151 100644 --- a/build/win32/vs10/gtk3-install.vcxproj +++ b/build/win32/vs10/gtk3-install.vcxproj @@ -158,35 +158,35 @@ Installing Build Results... $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) blah;%(Outputs) Installing Build Results... $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) blah;%(Outputs) Installing Build Results... $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) blah;%(Outputs) Installing Build Results... $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) blah;%(Outputs) Installing Build Results... $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) blah;%(Outputs) Installing Build Results... $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) blah;%(Outputs) Installing Build Results... $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) blah;%(Outputs) Installing Build Results... $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) blah;%(Outputs) diff --git a/build/win32/vs9/gtk3-install.vcproj b/build/win32/vs9/gtk3-install.vcproj index d0f2ac2559..be1e9c125b 100644 --- a/build/win32/vs9/gtk3-install.vcproj +++ b/build/win32/vs9/gtk3-install.vcproj @@ -29,7 +29,7 @@ > diff --git a/build/win32/vs9/gtk3-install.vspropsin b/build/win32/vs9/gtk3-install.vspropsin index 883d06ed96..e665d1342c 100644 --- a/build/win32/vs9/gtk3-install.vspropsin +++ b/build/win32/vs9/gtk3-install.vspropsin @@ -132,13 +132,17 @@ copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas - + " + /> +