From 212075094f3b3bda7a75196fe14917bd145b3206 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Sun, 2 Nov 2008 19:41:25 +0000
Subject: [PATCH] Bug 558153 - Patch for .def files generation

2008-11-02  Tor Lillqvist  <tml@novell.com>

	Bug 558153 - Patch for .def files generation

	* win32/{vs8,vs9}/*.vcproj: Add &quot; around paths, making it
	possible to compile in a directory containing spaces. .def files
	generation is done for every configuration not only the "Debug"
	ones.

	Patch by Guillaume Duhamel.


svn path=/trunk/; revision=7639
---
 build/ChangeLog                |   11 +
 build/win32/vs8/gio.vcproj     |  962 +++++++++----------
 build/win32/vs8/glib.vcproj    | 1200 +++++++++++------------
 build/win32/vs8/gobject.vcproj |   12 +-
 build/win32/vs9/gio.vcproj     | 1324 +++++++++++++-------------
 build/win32/vs9/glib.vcproj    | 1618 ++++++++++++++++----------------
 build/win32/vs9/gmodule.vcproj |  830 ++++++++--------
 build/win32/vs9/gobject.vcproj |   24 +-
 8 files changed, 3041 insertions(+), 2940 deletions(-)

diff --git a/build/ChangeLog b/build/ChangeLog
index e4916226d..e8e555c5b 100644
--- a/build/ChangeLog
+++ b/build/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-02  Tor Lillqvist  <tml@novell.com>
+
+	Bug 558153 - Patch for .def files generation
+
+	* win32/{vs8,vs9}/*.vcproj: Add &quot; around paths, making it
+	possible to compile in a directory containing spaces. .def files
+	generation is done for every configuration not only the "Debug"
+	ones.
+
+	Patch by Guillaume Duhamel.
+
 2008-09-16  Tor Lillqvist  <tml@novell.com>
 
 	* win32/vs9: New folder. Project files for use with MSVS9. Based
diff --git a/build/win32/vs8/gio.vcproj b/build/win32/vs8/gio.vcproj
index 4aff4376a..13902acc4 100644
--- a/build/win32/vs8/gio.vcproj
+++ b/build/win32/vs8/gio.vcproj
@@ -1,476 +1,486 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="gio"
-	ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
-	RootNamespace="gio"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			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/proxy-libintl-20080418/include"
-				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"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include"
-				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"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\gio\gappinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gasynchelper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gasyncresult.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gbufferedinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gbufferedoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gcancellable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gcontenttype.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdatainputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdataoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdrive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdummyfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gemblem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gemblemedicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileattribute.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileenumerator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilenamecompleter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilterinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilteroutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\ginputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gio-marshal.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioaliasdef.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioenumtypes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\giomodule.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioscheduler.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gloadableicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocaldirectorymonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileenumerator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalvfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmemoryinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmemoryoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmount.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmountoperation.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gnativevolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\goutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gpollfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gseekable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gsimpleasyncresult.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gthemedicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gunionvolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvolume.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32appinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32mount.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32volumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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="..\..\..\gio\gio.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gio.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/gio.def &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 $(InputPath) &gt;&gt; $(InputDir)/gio.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="gio"
+	ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
+	RootNamespace="gio"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
+			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/proxy-libintl-20080418/include"
+				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"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
+				ModuleDefinitionFile="../../../gio/gio.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../../gio,../../..,../../../glib,../../../gmodule,../../../../dependencies/proxy-libintl-20080418/include"
+				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"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
+				ModuleDefinitionFile="../../../gio/gio.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\gio\gappinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gasynchelper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gasyncresult.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gbufferedinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gbufferedoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gcancellable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gcontenttype.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gdatainputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gdataoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gdrive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gdummyfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gemblem.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gemblemedicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileattribute.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileenumerator.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfilemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfilenamecompleter.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfilterinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfilteroutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\ginputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gio-marshal.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gioaliasdef.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gioenumtypes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gioerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\giomodule.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gioscheduler.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gloadableicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocaldirectorymonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfileenumerator.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfileinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfileinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfilemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfileoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalvfs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gmemoryinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gmemoryoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gmount.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gmountoperation.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gnativevolumemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\goutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gpollfilemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gseekable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gsimpleasyncresult.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gthemedicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gunionvolumemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gvfs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gvolume.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gvolumemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gwin32appinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gwin32mount.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gwin32volumemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			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="..\..\..\gio\gio.def"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gio.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs8/glib.vcproj b/build/win32/vs8/glib.vcproj
index 074d10274..00d6efffd 100644
--- a/build/win32/vs8/glib.vcproj
+++ b/build/win32/vs8/glib.vcproj
@@ -1,595 +1,605 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="glib"
-	ProjectGUID="{12BCA020-EABF-429E-876A-A476BC9C10C0}"
-	RootNamespace="glib"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			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/proxy-libintl-20080418/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"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
-			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/proxy-libintl-20080418/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"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\glib\garray.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gasyncqueue.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gatomic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbacktrace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbase64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbookmarkfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gcache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gchecksum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gcompletion.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gconvert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdataset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gfileutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\ghash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\ghook.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\giochannel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\giowin32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gkeyfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\glist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmappedfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmarkup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmessages.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gnode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\goption.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gpattern.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gprimes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gprintf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gqsort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gqueue.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\grand.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gregex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\grel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gscanner.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gsequence.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gshell.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gslice.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gslist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gspawn-win32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstdio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstrfuncs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstring.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtestutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gthread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gthreadpool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtimer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunibreak.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunicollate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunidecomp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\guniprop.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gurifuncs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gutf8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gwin32.c"
-				>
-			</File>
-			<Filter
-				Name="libcharset"
-				>
-				<File
-					RelativePath="..\..\..\glib\libcharset\localcharset.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="gnulib"
-				>
-				<File
-					RelativePath="..\..\..\glib\gnulib\asnprintf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf-args.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf-parse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\vasnprintf.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="pcre"
-				>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_chartables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_compile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_config.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_exec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_get.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_globals.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_info.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_maketables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_newline.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_refcount.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_study.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_tables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_version.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_xclass.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\glib.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/glib.def &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 -DG_GNUC_FORMAT=;G_GNUC_FORMAT $(InputPath) &gt;&gt; $(InputDir)/glib.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="glib"
+	ProjectGUID="{12BCA020-EABF-429E-876A-A476BC9C10C0}"
+	RootNamespace="glib"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
+			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/proxy-libintl-20080418/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"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib"
+				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
+				ModuleDefinitionFile="../../../glib/glib.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\obj"
+			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/proxy-libintl-20080418/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"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib"
+				OutputFile="$(OutDir)\lib$(ProjectName)-2.0-0-vs8.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../dependencies/proxy-libintl-20080418/lib"
+				ModuleDefinitionFile="../../../glib/glib.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-2.0-vs8.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\glib\garray.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gasyncqueue.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gatomic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gbacktrace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gbase64.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gbookmarkfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gcache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gchecksum.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gcompletion.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gconvert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gdataset.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gdate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gdir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gfileutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\ghash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\ghook.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\giochannel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\giowin32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gkeyfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\glist.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmappedfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmarkup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmem.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmessages.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gnode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\goption.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gpattern.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gprimes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gprintf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gqsort.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gqueue.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\grand.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gregex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\grel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gscanner.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gsequence.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gshell.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gslice.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gslist.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gspawn-win32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gstdio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gstrfuncs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gstring.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gtestutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gthread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gthreadpool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gtimer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gtree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gunibreak.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gunicollate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gunidecomp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\guniprop.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gurifuncs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gutf8.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gwin32.c"
+				>
+			</File>
+			<Filter
+				Name="libcharset"
+				>
+				<File
+					RelativePath="..\..\..\glib\libcharset\localcharset.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="gnulib"
+				>
+				<File
+					RelativePath="..\..\..\glib\gnulib\asnprintf.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\gnulib\printf-args.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\gnulib\printf-parse.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\gnulib\printf.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\gnulib\vasnprintf.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="pcre"
+				>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_chartables.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_compile.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_config.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_exec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_get.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_globals.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_info.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_maketables.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_newline.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_refcount.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_study.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_tables.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_version.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_xclass.c"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			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"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\glib.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating glib.def"
+						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/glib.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 -DG_GNUC_FORMAT=;G_GNUC_FORMAT &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/glib.def&quot;&#x0D;&#x0A;"
+						Outputs="$(InputDir)/glib.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating glib.def"
+						CommandLine="echo EXPORTS &gt; &quot;$(InputDir)/glib.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 -DG_GNUC_FORMAT=;G_GNUC_FORMAT &quot;$(InputPath)&quot; &gt;&gt; &quot;$(InputDir)/glib.def&quot;&#x0D;&#x0A;"
+						Outputs="$(InputDir)/glib.def"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs8/gobject.vcproj b/build/win32/vs8/gobject.vcproj
index d469216d5..21c607952 100644
--- a/build/win32/vs8/gobject.vcproj
+++ b/build/win32/vs8/gobject.vcproj
@@ -273,7 +273,17 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/gobject.def &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 $(InputPath) &gt;&gt; $(InputDir)/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;"
+						Outputs="$(InputDir)/gobject.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<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;"
 						Outputs="$(InputDir)/gobject.def"
 					/>
 				</FileConfiguration>
diff --git a/build/win32/vs9/gio.vcproj b/build/win32/vs9/gio.vcproj
index ac5d03948..e3e1eaf6d 100644
--- a/build/win32/vs9/gio.vcproj
+++ b/build/win32/vs9/gio.vcproj
@@ -1,652 +1,672 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="gio"
-	ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
-	RootNamespace="gio"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
-			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"
-				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"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<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"
-				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"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			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"
-				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"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<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"
-				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"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../gio/gio.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\gio\gappinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gasynchelper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gasyncresult.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gbufferedinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gbufferedoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gcancellable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gcontenttype.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdatainputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdataoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdrive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gdummyfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gemblem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gemblemedicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileattribute.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileenumerator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilenamecompleter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfileoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilterinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gfilteroutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\ginputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gio-marshal.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioaliasdef.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioenumtypes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\giomodule.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gioscheduler.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gloadableicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocaldirectorymonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileenumerator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalfileoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\glocalvfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmemoryinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmemoryoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmount.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gmountoperation.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gnativevolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\goutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gpollfilemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gseekable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gsimpleasyncresult.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gthemedicon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gunionvolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvfs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvolume.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gvolumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32appinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32mount.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gwin32volumemonitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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="..\..\..\gio\gio.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gio\gio.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/gio.def &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 $(InputPath) &gt;&gt; $(InputDir)/gio.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gio.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/gio.def &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 $(InputPath) &gt;&gt; $(InputDir)/gio.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gio.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="gio"
+	ProjectGUID="{F3D1583C-5613-4809-BD98-7CC1C1276F92}"
+	RootNamespace="gio"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			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"
+				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"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
+				ModuleDefinitionFile="../../../gio/gio.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<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"
+				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"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
+				ModuleDefinitionFile="../../../gio/gio.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			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"
+				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"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
+				ModuleDefinitionFile="../../../gio/gio.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<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"
+				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"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib shlwapi.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
+				ModuleDefinitionFile="../../../gio/gio.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\gio\gappinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gasynchelper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gasyncresult.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gbufferedinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gbufferedoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gcancellable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gcontenttype.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gdatainputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gdataoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gdrive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gdummyfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gemblem.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gemblemedicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileattribute.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileenumerator.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfilemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfilenamecompleter.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfileoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfilterinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gfilteroutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\ginputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gio-marshal.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gioaliasdef.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gioenumtypes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gioerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\giomodule.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gioscheduler.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gloadableicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocaldirectorymonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfileenumerator.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfileinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfileinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfilemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalfileoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\glocalvfs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gmemoryinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gmemoryoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gmount.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gmountoperation.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gnativevolumemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\goutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gpollfilemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gseekable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gsimpleasyncresult.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gthemedicon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gunionvolumemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gvfs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gvolume.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gvolumemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gwin32appinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwin32directorymonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gwin32mount.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gwin32volumemonitor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfileinputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpfileoutputstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\win32\gwinhttpvfs.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			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="..\..\..\gio\gio.def"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gio\gio.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/glib.vcproj b/build/win32/vs9/glib.vcproj
index de324594a..db3ceffa3 100644
--- a/build/win32/vs9/glib.vcproj
+++ b/build/win32/vs9/glib.vcproj
@@ -1,809 +1,809 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="glib"
-	ProjectGUID="{12BCA020-EABF-429E-876A-A476BC9C10C0}"
-	RootNamespace="glib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
-			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"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			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"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			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"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			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"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="intl.lib Ws2_32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
-				ModuleDefinitionFile="../../../glib/glib.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\glib\garray.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gasyncqueue.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gatomic.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbacktrace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbase64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gbookmarkfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gcache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gchecksum.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gcompletion.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gconvert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdataset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gdir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gfileutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\ghash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\ghook.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\giochannel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\giowin32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gkeyfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\glist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmappedfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmarkup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gmessages.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gnode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\goption.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gpattern.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gprimes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gprintf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gqsort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gqueue.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\grand.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gregex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\grel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gscanner.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gsequence.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gshell.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gslice.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gslist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gspawn-win32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstdio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstrfuncs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gstring.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtestutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gthread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gthreadpool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtimer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gtree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunibreak.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunicollate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gunidecomp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\guniprop.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gurifuncs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gutf8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\gwin32.c"
-				>
-			</File>
-			<Filter
-				Name="libcharset"
-				>
-				<File
-					RelativePath="..\..\..\glib\libcharset\localcharset.c"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|x64"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-			<Filter
-				Name="gnulib"
-				>
-				<File
-					RelativePath="..\..\..\glib\gnulib\asnprintf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf-args.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf-parse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\printf.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\gnulib\vasnprintf.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="pcre"
-				>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_chartables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_compile.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_config.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_exec.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_get.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_globals.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_info.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_maketables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_newline.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_refcount.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_study.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_tables.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_version.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\glib\pcre\pcre_xclass.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\glib\glib.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/glib.def &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 $(InputPath) &gt;&gt; $(InputDir)/glib.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/glib.def &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 $(InputPath) &gt;&gt; $(InputDir)/glib.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/glib.def &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 $(InputPath) &gt;&gt; $(InputDir)/glib.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating glib.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/glib.def &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 $(InputPath) &gt;&gt; $(InputDir)/glib.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/glib.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="glib"
+	ProjectGUID="{12BCA020-EABF-429E-876A-A476BC9C10C0}"
+	RootNamespace="glib"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			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"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
+				ModuleDefinitionFile="../../../glib/glib.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			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"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
+				ModuleDefinitionFile="../../../glib/glib.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			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"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
+				ModuleDefinitionFile="../../../glib/glib.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			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"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="intl.lib Ws2_32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../../dependencies/$(PlatformName)/proxy-libintl-20080916/lib"
+				ModuleDefinitionFile="../../../glib/glib.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\glib\garray.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gasyncqueue.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gatomic.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gbacktrace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gbase64.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gbookmarkfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gcache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gchecksum.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gcompletion.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gconvert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gdataset.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gdate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gdir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gerror.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gfileutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\ghash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\ghook.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\giochannel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\giowin32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gkeyfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\glist.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmappedfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmarkup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmem.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gmessages.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gnode.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\goption.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gpattern.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gprimes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gprintf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gqsort.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gqueue.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\grand.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gregex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\grel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gscanner.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gsequence.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gshell.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gslice.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gslist.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gspawn-win32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gstdio.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gstrfuncs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gstring.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gtestutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gthread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gthreadpool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gtimer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gtree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gunibreak.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gunicollate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gunidecomp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\guniprop.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gurifuncs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gutf8.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\gwin32.c"
+				>
+			</File>
+			<Filter
+				Name="libcharset"
+				>
+				<File
+					RelativePath="..\..\..\glib\libcharset\localcharset.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="LIBDIR=&quot;/irrelevant/lib&quot;"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="gnulib"
+				>
+				<File
+					RelativePath="..\..\..\glib\gnulib\asnprintf.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\gnulib\printf-args.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\gnulib\printf-parse.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\gnulib\printf.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\gnulib\vasnprintf.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="pcre"
+				>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_chartables.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_compile.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_config.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_dfa_exec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_exec.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_fullinfo.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_get.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_globals.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_info.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_maketables.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_newline.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_ord2utf8.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_refcount.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_study.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_tables.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_try_flipped.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_ucp_searchfuncs.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_valid_utf8.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_version.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\glib\pcre\pcre_xclass.c"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			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"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\glib\glib.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/gmodule.vcproj b/build/win32/vs9/gmodule.vcproj
index 357cb347f..d513f1cd9 100644
--- a/build/win32/vs9/gmodule.vcproj
+++ b/build/win32/vs9/gmodule.vcproj
@@ -1,405 +1,425 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="gmodule"
-	ProjectGUID="{4214047C-F5C1-40B3-8369-5DCED8C32770}"
-	RootNamespace="gmodule"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
-			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"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="../../../gmodule/gmodule.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<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"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="../../../gmodule/gmodule.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			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"
-				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"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="../../../gmodule/gmodule.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<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"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="../../../gmodule/gmodule.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				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>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\gmodule\gmodule.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\gmodule\gmodule.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gmodule.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/gmodule.def &amp;&amp; cl /EP -DG_OS_WIN32 $(InputPath) &gt;&gt; $(InputDir)/gmodule.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gmodule.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gmodule.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/gmodule.def &amp;&amp; cl /EP -DG_OS_WIN32 $(InputPath) &gt;&gt; $(InputDir)/gmodule.def&#x0D;&#x0A;"
-						Outputs="$(InputDir)/gmodule.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="gmodule"
+	ProjectGUID="{4214047C-F5C1-40B3-8369-5DCED8C32770}"
+	RootNamespace="gmodule"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
+			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"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="../../../gmodule/gmodule.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<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"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="../../../gmodule/gmodule.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			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"
+				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"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="../../../gmodule/gmodule.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<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"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+				ForcedIncludeFiles="msvc_recommended_pragmas.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\$(ProjectName)-2-vs9.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="../../../gmodule/gmodule.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				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>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\gmodule\gmodule.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			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"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\gmodule\gmodule.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/gobject.vcproj b/build/win32/vs9/gobject.vcproj
index 5271fe99d..16ad72307 100644
--- a/build/win32/vs9/gobject.vcproj
+++ b/build/win32/vs9/gobject.vcproj
@@ -435,7 +435,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/gobject.def &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 $(InputPath) &gt;&gt; $(InputDir)/gobject.def&#x0D;&#x0A;"
+						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"
 					/>
 				</FileConfiguration>
@@ -445,7 +445,27 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating gobject.def"
-						CommandLine="echo EXPORTS &gt; $(InputDir)/gobject.def &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 $(InputPath) &gt;&gt; $(InputDir)/gobject.def&#x0D;&#x0A;"
+						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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<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"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<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"
 					/>
 				</FileConfiguration>