From 9d444f7b12fff6b7f9e6ba4a2667ab293af793eb Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Thu, 4 Feb 2010 14:36:23 +0200
Subject: [PATCH] Refactor VS9 project files

Factor out common parts into a vsprops file. Drop empty elements for
tools that aren't used.
---
 build/win32/vs9/Makefile.am                   |   9 +-
 build/win32/vs9/gio.vcproj                    | 184 +++-------------
 build/win32/vs9/glib-genmarshal.vcproj        | 138 +-----------
 build/win32/vs9/glib.vcproj                   | 194 +++--------------
 build/win32/vs9/glib.vsprops                  | 196 ++++++++++++++++++
 build/win32/vs9/gmodule.vcproj                | 173 ++--------------
 build/win32/vs9/gobject.vcproj                | 178 ++--------------
 .../vs9/gspawn-win32-helper-console.vcproj    | 142 +------------
 build/win32/vs9/gspawn-win32-helper.vcproj    | 142 +------------
 build/win32/vs9/gthread.vcproj                | 150 +-------------
 build/win32/vs9/install.vcproj                | 164 +--------------
 build/win32/vs9/testglib.vcproj               | 142 +------------
 12 files changed, 319 insertions(+), 1493 deletions(-)
 create mode 100644 build/win32/vs9/glib.vsprops

diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index bf5b4640d..d2540d571 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,13 +1,14 @@
 EXTRA_DIST = \
 	README \
-	gio.vcproj \
-	glib-genmarshal.vcproj \
 	glib.sln \
+	glib.vsprops \
 	glib.vcproj \
-	gmodule.vcproj \
-	gobject.vcproj \
+	glib-genmarshal.vcproj \
 	gspawn-win32-helper-console.vcproj \
 	gspawn-win32-helper.vcproj \
+	gmodule.vcproj \
+	gobject.vcproj \
 	gthread.vcproj \
+	gio.vcproj \
 	testglib.vcproj \
 	install.vcproj
diff --git a/build/win32/vs9/gio.vcproj b/build/win32/vs9/gio.vcproj
index c3697e5dc..4d0b096fc 100644
--- a/build/win32/vs9/gio.vcproj
+++ b/build/win32/vs9/gio.vcproj
@@ -20,30 +20,17 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
+				AdditionalIncludeDirectories="../../../gio,../../../gmodule"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -52,7 +39,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -65,11 +51,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib Dnsapi.lib"
+				AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
+				ModuleDefinitionFile="$(IntDir)\gio.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -77,32 +62,13 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -110,28 +76,15 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
+				AdditionalIncludeDirectories="../../../gio,../../../gmodule"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -144,11 +97,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib Dnsapi.lib"
+				AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
+				ModuleDefinitionFile="$(IntDir)\gio.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -158,55 +110,23 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
+				AdditionalIncludeDirectories="../../../gio,../../../gmodule"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -215,7 +135,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -228,11 +147,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib Dnsapi.lib"
+				AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
+				ModuleDefinitionFile="$(IntDir)\gio.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -240,32 +158,13 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -273,29 +172,15 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
+				AdditionalIncludeDirectories="../../../gio,../../../gmodule"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GLib-GIO\&quot;;G_DISABLE_DEPRECATED;GIO_COMPILATION;GIO_MODULE_DIR=\&quot;gio/modules\&quot;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -308,11 +193,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib Dnsapi.lib"
+				AdditionalDependencies="ws2_32.lib shlwapi.lib dnsapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
+				ModuleDefinitionFile="$(IntDir)\gio.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -322,24 +206,6 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -722,7 +588,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\..\..\gio\gio.def"
+				RelativePath="..\..\..\gio\gio.rc"
 				>
 			</File>
 			<File
@@ -734,8 +600,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gio.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gio.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
+						CommandLine="$(GlibGenerateGioDef)"
+						Outputs="$(IntDir)/gio.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -744,8 +610,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gio.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gio.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
+						CommandLine="$(GlibGenerateGioDef)"
+						Outputs="$(IntDir)/gio.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -754,8 +620,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gio.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gio.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
+						CommandLine="$(GlibGenerateGioDef)"
+						Outputs="$(IntDir)/gio.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -764,8 +630,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gio.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gio.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
+						CommandLine="$(GlibGenerateGioDef)"
+						Outputs="$(IntDir)/gio.def"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/build/win32/vs9/glib-genmarshal.vcproj b/build/win32/vs9/glib-genmarshal.vcproj
index 48fe33bbe..95b32f5df 100644
--- a/build/win32/vs9/glib-genmarshal.vcproj
+++ b/build/win32/vs9/glib-genmarshal.vcproj
@@ -21,30 +21,16 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -72,32 +58,13 @@
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
@@ -105,21 +72,8 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -147,55 +101,22 @@
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -223,32 +144,13 @@
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
@@ -256,22 +158,8 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -299,24 +187,6 @@
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/build/win32/vs9/glib.vcproj b/build/win32/vs9/glib.vcproj
index dd6d7dba1..3da38b649 100644
--- a/build/win32/vs9/glib.vcproj
+++ b/build/win32/vs9/glib.vcproj
@@ -21,32 +21,17 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;:DONE_CONFIG_H&#x0D;&#x0A;if exist ..\..\..\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;:DONE_GLIBCONFIG_H&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -54,7 +39,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -67,11 +51,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
+				ModuleDefinitionFile="$(IntDir)\glib.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -79,57 +62,23 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;:DONE_CONFIG_H&#x0D;&#x0A;if exist ..\..\..\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;:DONE_GLIBCONFIG_H&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -137,7 +86,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -150,11 +98,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
+				ModuleDefinitionFile="$(IntDir)\glib.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -162,62 +109,28 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\config.h goto GLIB_CONFIG&#x0D;&#x0A;copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;:GLIB_CONFIG&#x0D;&#x0A;if exist ..\..\..\glibconfig.h\ goto END&#x0D;&#x0A;copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;:END&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib\&quot;;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -230,11 +143,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
+				ModuleDefinitionFile="$(IntDir)\glib.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -244,63 +156,28 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\config.h goto GLIB_CONFIG&#x0D;&#x0A;copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;:GLIB_CONFIG&#x0D;&#x0A;if exist ..\..\..\glibconfig.h\ goto END&#x0D;&#x0A;copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;:END&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib\&quot;;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -313,11 +190,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
+				AdditionalDependencies="ws2_32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
+				ModuleDefinitionFile="$(IntDir)\glib.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -327,24 +203,6 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -758,10 +616,6 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
-			<File
-				RelativePath="..\..\..\glib\glib.def"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\glib\glib.rc"
 				>
@@ -775,8 +629,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/glib.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/glib.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
+						CommandLine="$(GlibGenerateGlibDef)"
+						Outputs="$(IntDir)\glib.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -785,8 +639,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/glib.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/glib.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
+						CommandLine="$(GlibGenerateGlibDef)"
+						Outputs="$(IntDir)\glib.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -795,8 +649,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/glib.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/glib.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
+						CommandLine="$(GlibGenerateGlibDef)"
+						Outputs="$(IntDir)\glib.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -805,8 +659,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/glib.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/glib.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
+						CommandLine="$(GlibGenerateGlibDef)"
+						Outputs="$(IntDir)\glib.def"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/build/win32/vs9/glib.vsprops b/build/win32/vs9/glib.vsprops
new file mode 100644
index 000000000..6f7a234ac
--- /dev/null
+++ b/build/win32/vs9/glib.vsprops
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="glibprops"
+	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl/include"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED"
+		ForcedIncludeFiles="msvc_recommended_pragmas.h"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="intl.lib"
+		AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl/lib"
+	/>
+	<Tool
+		Name="VCPreBuildEventTool"
+		CommandLine="
+if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
+copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
+:DONE_CONFIG_H&#x0D;&#x0A;
+
+if exist ..\..\..\glibconfig.h goto DONE_GLIBCONFIG_H&#x0D;&#x0A;
+copy ..\..\..\glibconfig.h.win32 ..\..\..\glibconfig.h&#x0D;&#x0A;
+:DONE_GLIBCONFIG_H&#x0D;&#x0A;
+
+if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H&#x0D;&#x0A;
+copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;
+:DONE_GMODULECONF_H&#x0D;&#x0A;
+"
+	/>
+	<UserMacro
+		Name="GlibDoInstall"
+		Value="
+mkdir $(OutDir)\bin&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2-vs9.dll $(OutDir)\bin&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-genmarshal.exe $(OutDir)\bin&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gspawn-win32-helper*.exe $(OutDir)\bin&#x0D;&#x0A;
+
+mkdir $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\glib.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;
+copy ..\..\..\gmodule\gmodule.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;
+copy ..\..\..\glib\glib-object.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;
+copy ..\..\..\glib\galloca.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\garray.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gasyncqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gatomic.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gbacktrace.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gbase64.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gbookmarkfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gcache.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gchecksum.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gcompletion.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gconvert.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gdataset.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gdate.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gdir.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gerror.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gfileutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\ghash.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\ghook.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\ghostutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gi18n-lib.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gi18n.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\giochannel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gkeyfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\glist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gmacros.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gmain.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gmappedfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gmarkup.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gmem.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gmessages.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gnode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\goption.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gpattern.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gprimes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gprintf.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gqsort.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gquark.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\grand.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gregex.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\grel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gscanner.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gsequence.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gshell.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gslice.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gslist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gspawn.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gstdio.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gstrfuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gstring.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gtestutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gthread.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gthreadpool.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gtimer.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gtree.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gtypes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gunicode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gurifuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+copy ..\..\..\glib\gwin32.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;
+
+mkdir $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gboxed.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\genums.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gmarshal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gobject.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gobjectnotifyqueue.c $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gparam.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gparamspecs.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gsignal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gsourceclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gtype.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gtypemodule.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gtypeplugin.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gvalue.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gvaluearray.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gvaluecollector.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+copy ..\..\..\gobject\gvaluetypes.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;
+
+mkdir $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gappinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gbufferedinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gbufferedoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gcancellable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gcontenttype.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdatainputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdataoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gdrive.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gemblem.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gemblemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfile.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfileattribute.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfileenumerator.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfileicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfileinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfileinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfilemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfilenamecompleter.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfileoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfilterinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gfilteroutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\ginputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gio.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gioenums.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gioenumtypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gioerror.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\giomodule.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gioscheduler.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\giotypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gloadableicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gmemoryinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gmemoryoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gmount.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gmountoperation.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gnativevolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\goutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gseekable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gsimpleasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gthemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gvfs.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gvolume.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+copy ..\..\..\gio\gvolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;
+
+mkdir $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;
+copy ..\..\..\glibconfig.h $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;
+
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-2.0.lib $(OutDir)\lib&#x0D;&#x0A;
+"
+	/>
+	<UserMacro
+		Name="GlibGenerateGlibDef"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\glib.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF -DG_GNUC_FORMAT=;G_GNUC_FORMAT ..\..\..\glib\glib.symbols &gt;&gt;&quot;$(IntDir)\glib.def&quot;"
+	/>
+	<UserMacro
+		Name="GlibGenerateGmoduleDef"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gmodule.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 ..\..\..\gmodule\gmodule.symbols &gt;&gt;&quot;$(IntDir)\gmodule.def&quot;"
+	/>
+	<UserMacro
+		Name="GlibGenerateGobjectDef"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gobject.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gobject\gobject.symbols &gt;&gt;&quot;$(IntDir)\gobject.def&quot;"
+	/>
+	<UserMacro
+		Name="GlibGenerateGioDef"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gio.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gio\gio.symbols &gt;&gt;&quot;$(IntDir)\gio.def&quot;"
+	/>
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gmodule.vcproj b/build/win32/vs9/gmodule.vcproj
index 7cfc34edf..d27ea9656 100644
--- a/build/win32/vs9/gmodule.vcproj
+++ b/build/win32/vs9/gmodule.vcproj
@@ -21,32 +21,17 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\gmodule\gmoduleconf.h goto END&#x0D;&#x0A;copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;:END&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../glib;../../.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GModule\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -54,7 +39,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -69,7 +53,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="../../../gmodule/gmodule.def"
+				ModuleDefinitionFile="$(IntDir)\gmodule.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -77,24 +61,6 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -109,30 +75,15 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\gmodule\gmoduleconf.h goto END&#x0D;&#x0A;copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;:END&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../glib;../../.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GModule\&quot;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -147,7 +98,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="../../../gmodule/gmodule.def"
+				ModuleDefinitionFile="$(IntDir)\gmodule.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -157,24 +108,6 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -188,26 +121,11 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\gmodule\gmoduleconf.h goto END&#x0D;&#x0A;copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;:END&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../glib;../../.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GModule\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -215,7 +133,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -230,7 +147,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="../../../gmodule/gmodule.def"
+				ModuleDefinitionFile="$(IntDir)\gmodule.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -238,24 +155,6 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -270,31 +169,15 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if exist ..\..\..\gmodule\gmoduleconf.h goto END&#x0D;&#x0A;copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h&#x0D;&#x0A;:END&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../glib;../../.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GModule\&quot;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -309,7 +192,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="../../../gmodule/gmodule.def"
+				ModuleDefinitionFile="$(IntDir)\gmodule.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -319,24 +202,6 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -366,10 +231,6 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
-			<File
-				RelativePath="..\..\..\gmodule\gmodule.def"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\gmodule\gmodule.rc"
 				>
@@ -383,8 +244,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gmodule.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gmodule.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gmodule.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gmodule.def"
+						CommandLine="$(GlibGenerateGmoduleDef)"
+						Outputs="$(IntDir)/gmodule.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -393,8 +254,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gmodule.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gmodule.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gmodule.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gmodule.def"
+						CommandLine="$(GlibGenerateGmoduleDef)"
+						Outputs="$(IntDir)/gmodule.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -403,8 +264,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gmodule.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gmodule.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gmodule.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gmodule.def"
+						CommandLine="$(GlibGenerateGmoduleDef)"
+						Outputs="$(IntDir)/gmodule.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -413,8 +274,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gmodule.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gmodule.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gmodule.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gmodule.def"
+						CommandLine="$(GlibGenerateGmoduleDef)"
+						Outputs="$(IntDir)/gmodule.def"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/build/win32/vs9/gobject.vcproj b/build/win32/vs9/gobject.vcproj
index a0861a807..3e095d754 100644
--- a/build/win32/vs9/gobject.vcproj
+++ b/build/win32/vs9/gobject.vcproj
@@ -21,38 +21,23 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -67,7 +52,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="../../../gobject/gobject.def"
+				ModuleDefinitionFile="$(IntDir)\gobject.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -75,32 +60,13 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -108,28 +74,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -144,7 +96,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="../../../gobject/gobject.def"
+				ModuleDefinitionFile="$(IntDir)\gobject.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -155,63 +107,29 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -226,7 +144,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="../../../gobject/gobject.def"
+				ModuleDefinitionFile="$(IntDir)\gobject.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -234,32 +152,13 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -267,29 +166,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -304,7 +188,7 @@
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="../../../gobject/gobject.def"
+				ModuleDefinitionFile="$(IntDir)\gobject.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -315,24 +199,6 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -418,10 +284,6 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
-			<File
-				RelativePath="..\..\..\gobject\gobject.def"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\gobject\gobject.rc"
 				>
@@ -435,8 +297,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gobject.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gobject.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gobject.def"
+						CommandLine="$(GlibGenerateGobjectDef)"
+						Outputs="$(IntDir)/gobject.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -445,8 +307,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gobject.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gobject.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gobject.def"
+						CommandLine="$(GlibGenerateGobjectDef)"
+						Outputs="$(IntDir)/gobject.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -455,8 +317,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gobject.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gobject.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gobject.def"
+						CommandLine="$(GlibGenerateGobjectDef)"
+						Outputs="$(IntDir)/gobject.def"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -465,8 +327,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/gobject.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= -DG_GNUC_PRINTF=;G_GNUC_PRINTF &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/gobject.def&quot;&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gobject.def"
+						CommandLine="$(GlibGenerateGobjectDef)"
+						Outputs="$(IntDir)/gobject.def"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/build/win32/vs9/gspawn-win32-helper-console.vcproj b/build/win32/vs9/gspawn-win32-helper-console.vcproj
index 480010885..061b772d1 100644
--- a/build/win32/vs9/gspawn-win32-helper-console.vcproj
+++ b/build/win32/vs9/gspawn-win32-helper-console.vcproj
@@ -21,30 +21,16 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -53,7 +39,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -73,32 +58,13 @@
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -106,28 +72,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -149,55 +101,22 @@
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +125,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -227,32 +145,13 @@
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -260,29 +159,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -305,24 +189,6 @@
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/build/win32/vs9/gspawn-win32-helper.vcproj b/build/win32/vs9/gspawn-win32-helper.vcproj
index 1709b7243..139425292 100644
--- a/build/win32/vs9/gspawn-win32-helper.vcproj
+++ b/build/win32/vs9/gspawn-win32-helper.vcproj
@@ -21,30 +21,16 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -53,7 +39,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -73,55 +58,22 @@
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -130,7 +82,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -151,32 +102,13 @@
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -184,28 +116,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -228,32 +146,13 @@
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -261,29 +160,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -305,24 +189,6 @@
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/build/win32/vs9/gthread.vcproj b/build/win32/vs9/gthread.vcproj
index 5d01af4f0..0dc118c71 100644
--- a/build/win32/vs9/gthread.vcproj
+++ b/build/win32/vs9/gthread.vcproj
@@ -21,31 +21,17 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GThread\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -53,7 +39,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -76,32 +61,13 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -109,28 +75,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GThread\&quot;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -155,56 +107,23 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GThread\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -212,7 +131,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -235,32 +153,13 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -268,29 +167,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GThread\&quot;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -315,24 +199,6 @@
 				ImportLibrary="$(TargetDir)$(ProjectName)-2.0.lib"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 3b9fe271a..94c28dc97 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -21,53 +21,34 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
+			InheritedPropertySheets=".\glib.vsprops"
 			OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="10"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="mkdir $(OutDir)\bin&#x0D;&#x0A;copy $(SolutionDir)$(ConfigurationName)\*-2-vs9.dll $(OutDir)\bin&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\glib.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\gmodule\gmodule.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\glib\glib-object.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\glib\galloca.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\garray.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gasyncqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gatomic.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbacktrace.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbase64.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbookmarkfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gcache.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gchecksum.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gcompletion.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gconvert.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdataset.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdate.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdir.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gerror.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gfileutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghash.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghook.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghostutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gi18n-lib.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gi18n.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\giochannel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gkeyfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\glist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmacros.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmain.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmappedfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmarkup.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmem.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmessages.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gnode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\goption.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gpattern.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gprimes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gprintf.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gqsort.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gquark.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\grand.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gregex.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\grel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gscanner.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gsequence.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gshell.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gslice.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gslist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gspawn.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstdio.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstrfuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstring.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtestutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gthread.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gthreadpool.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtimer.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtree.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtypes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gunicode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gurifuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gwin32.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gboxed.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\genums.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gmarshal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gobject.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gobjectnotifyqueue.c $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gparam.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gparamspecs.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gsignal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gsourceclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtype.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtypemodule.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtypeplugin.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvalue.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluearray.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluecollector.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluetypes.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gappinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gbufferedinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gbufferedoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gcancellable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gcontenttype.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdatainputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdataoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdrive.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gemblem.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gemblemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfile.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileattribute.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileenumerator.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilenamecompleter.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilterinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilteroutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\ginputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gio.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioenums.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioenumtypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioerror.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\giomodule.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioscheduler.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\giotypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gloadableicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmemoryinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmemoryoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmount.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmountoperation.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gnativevolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\goutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gseekable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gsimpleasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gthemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvfs.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvolume.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;copy ..\..\..\glibconfig.h $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;rem&#x0D;&#x0A;copy $(SolutionDir)$(ConfigurationName)\*-2.0.lib $(OutDir)\lib&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+				CommandLine="$(GlibDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
+			InheritedPropertySheets=".\glib.vsprops"
 			OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="10"
 			CharacterSet="2"
 			DeleteExtensionsOnClean=""
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="mkdir $(OutDir)\bin&#x0D;&#x0A;copy $(SolutionDir)$(ConfigurationName)\*-2-vs9.dll $(OutDir)\bin&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\glib.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\gmodule\gmodule.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\glib\glib-object.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\glib\galloca.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\garray.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gasyncqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gatomic.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbacktrace.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbase64.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbookmarkfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gcache.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gchecksum.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gcompletion.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gconvert.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdataset.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdate.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdir.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gerror.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gfileutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghash.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghook.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gi18n-lib.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gi18n.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\giochannel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gkeyfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\glist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmacros.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmain.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmappedfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmarkup.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmem.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmessages.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gnode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\goption.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gpattern.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gprimes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gprintf.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gqsort.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gquark.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\grand.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gregex.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\grel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gscanner.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gsequence.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gshell.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gslice.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gslist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gspawn.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstdio.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstrfuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstring.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtestutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gthread.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gthreadpool.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtimer.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtree.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtypes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gunicode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gurifuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gwin32.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gboxed.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\genums.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gmarshal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gobject.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gobjectnotifyqueue.c $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gparam.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gparamspecs.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gsignal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gsourceclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtype.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtypemodule.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtypeplugin.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvalue.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluearray.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluecollector.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluetypes.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gappinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gbufferedinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gbufferedoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gcancellable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gcontenttype.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdatainputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdataoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdrive.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gemblem.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gemblemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfile.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileattribute.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileenumerator.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilenamecompleter.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilterinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilteroutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\ginputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gio.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioenums.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioenumtypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioerror.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\giomodule.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioscheduler.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\giotypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gloadableicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmemoryinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmemoryoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmount.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmountoperation.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gnativevolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\goutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gseekable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gsimpleasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gthemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvfs.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvolume.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;copy ..\..\..\glibconfig.h $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;rem&#x0D;&#x0A;copy $(SolutionDir)$(PlatformName)\$(ConfigurationName)\*-2.0.lib $(OutDir)\lib&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+				CommandLine="$(GlibDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
+			InheritedPropertySheets=".\glib.vsprops"
 			OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="10"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -75,74 +56,13 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="mkdir $(OutDir)\bin&#x0D;&#x0A;copy $(SolutionDir)$(ConfigurationName)\*-2-vs9.dll $(OutDir)\bin&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\glib.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\gmodule\gmodule.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\glib\glib-object.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\glib\galloca.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\garray.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gasyncqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gatomic.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbacktrace.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbase64.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbookmarkfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gcache.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gchecksum.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gcompletion.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gconvert.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdataset.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdate.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdir.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gerror.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gfileutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghash.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghook.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghostutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gi18n-lib.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gi18n.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\giochannel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gkeyfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\glist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmacros.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmain.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmappedfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmarkup.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmem.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmessages.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gnode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\goption.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gpattern.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gpoll.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gprimes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gprintf.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gqsort.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gquark.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\grand.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gregex.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\grel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gscanner.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gsequence.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gshell.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gslice.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gslist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gspawn.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstdio.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstrfuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstring.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtestutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gthread.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gthreadpool.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtimer.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtree.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtypes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gunicode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gurifuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gwin32.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gboxed.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\genums.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gmarshal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gobject.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gobjectnotifyqueue.c $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gparam.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gparamspecs.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gsignal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gsourceclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtype.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtypemodule.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtypeplugin.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvalue.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluearray.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluecollector.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluetypes.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gappinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gbufferedinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gbufferedoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gcancellable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gcontenttype.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdatainputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdataoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdrive.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gemblem.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gemblemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfile.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileattribute.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileenumerator.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilenamecompleter.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilterinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilteroutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\ginputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gio.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioenums.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioenumtypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioerror.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\giomodule.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioscheduler.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\giotypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gloadableicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmemoryinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmemoryoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmount.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmountoperation.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gnativevolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\goutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gseekable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gsimpleasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gthemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvfs.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvolume.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;copy ..\..\..\glibconfig.h $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;rem&#x0D;&#x0A;copy $(SolutionDir)$(ConfigurationName)\*-2.0.lib $(OutDir)\lib&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+				CommandLine="$(GlibDoInstall)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
+			InheritedPropertySheets=".\glib.vsprops"
 			OutputDirectory="..\..\..\..\dependencies\$(PlatformName)\vs9"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="10"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -150,76 +70,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="mkdir $(OutDir)\bin&#x0D;&#x0A;copy $(SolutionDir)$(ConfigurationName)\*-2-vs9.dll $(OutDir)\bin&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\glib.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\gmodule\gmodule.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\glib\glib-object.h $(OutDir)\include\glib-2.0&#x0D;&#x0A;copy ..\..\..\glib\galloca.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\garray.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gasyncqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gatomic.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbacktrace.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbase64.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gbookmarkfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gcache.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gchecksum.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gcompletion.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gconvert.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdataset.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdate.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gdir.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gerror.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gfileutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghash.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\ghook.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gi18n-lib.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gi18n.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\giochannel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gkeyfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\glist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmacros.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmain.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmappedfile.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmarkup.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmem.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gmessages.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gnode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\goption.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gpattern.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gprimes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gprintf.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gqsort.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gquark.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gqueue.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\grand.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gregex.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\grel.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gscanner.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gsequence.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gshell.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gslice.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gslist.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gspawn.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstdio.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstrfuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gstring.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtestutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gthread.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gthreadpool.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtimer.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtree.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gtypes.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gunicode.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gurifuncs.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gutils.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;copy ..\..\..\glib\gwin32.h $(OutDir)\include\glib-2.0\glib&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gboxed.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\genums.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gmarshal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gobject.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gobjectnotifyqueue.c $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gparam.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gparamspecs.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gsignal.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gsourceclosure.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtype.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtypemodule.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gtypeplugin.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvalue.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluearray.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluecollector.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;copy ..\..\..\gobject\gvaluetypes.h $(OutDir)\include\glib-2.0\gobject&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gappinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gbufferedinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gbufferedoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gcancellable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gcontenttype.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdatainputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdataoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gdrive.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gemblem.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gemblemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfile.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileattribute.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileenumerator.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileinfo.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilenamecompleter.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfileoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilterinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gfilteroutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\ginputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gio.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioenums.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioenumtypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioerror.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\giomodule.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gioscheduler.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\giotypes.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gloadableicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmemoryinputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmemoryoutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmount.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gmountoperation.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gnativevolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\goutputstream.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gseekable.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gsimpleasyncresult.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gthemedicon.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvfs.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvolume.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;copy ..\..\..\gio\gvolumemonitor.h $(OutDir)\include\glib-2.0\gio&#x0D;&#x0A;rem&#x0D;&#x0A;mkdir $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;copy ..\..\..\glibconfig.h $(OutDir)\lib\glib-2.0\include&#x0D;&#x0A;rem&#x0D;&#x0A;copy $(SolutionDir)$(PlatformName)\$(ConfigurationName)\*-2.0.lib $(OutDir)\lib&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
+				CommandLine="$(GlibDoInstall)"
 			/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
-	<Files>
-	</Files>
-	<Globals>
-	</Globals>
 </VisualStudioProject>
diff --git a/build/win32/vs9/testglib.vcproj b/build/win32/vs9/testglib.vcproj
index ff40c3251..d64d03fc8 100644
--- a/build/win32/vs9/testglib.vcproj
+++ b/build/win32/vs9/testglib.vcproj
@@ -21,30 +21,16 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -53,7 +39,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -73,32 +58,13 @@
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -106,28 +72,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -149,55 +101,22 @@
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -206,7 +125,6 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -226,32 +144,13 @@
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			InheritedPropertySheets=".\glib.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -259,29 +158,14 @@
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/include"
 				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -303,24 +187,6 @@
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>