Moved from MSVC_Net2003

2008-08-08  Armin Burgmeier  <armin@arbur.net>

	* MSVC_Net2005/: Moved from MSVC_Net2003

	* MSVC_Net2005/glibmm.sln:
	* MSVC_Net2005/glibmm/glibmm.vcproj:
	* MSVC_Net2005/examples/dispatcher/dispatcher.vcproj: Converted to
	project files for Visual Studio 2005.

	* MSVC_Net2005/glibmm/glibmm.rc.in: Removed the #include "resource.h"
	since there is no resource.h in the project, and the resource still
	seems to compile.

	* MSVC_Net2005/giomm/giomm.rc.in:
	* MSVC_Net2005/giomm/giomm.vcproj:
	* MSVC_Net2005/giomm/Makefile.am: Added giomm to the MSVC project.

	* MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj:
	* MSVC_Net2005/tests/giomm_simple/Makefile.am: Added giomm_simple to
	the MSVC project.

	* MSVC_Net2005/tests/Makefile.am:
	* MSVC_Net2005/Makefile.am:
	* Makefile.am:
	* configure.in: Adapted build files.

svn path=/trunk/; revision=714

36 files changed, 965 insertions, 117 deletions

diff --git a/ChangeLog b/ChangeLog
index a96c9c3b..1abf5cf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2008-08-08  Armin Burgmeier  <armin@arbur.net>
+
+	* MSVC_Net2005/: Moved from MSVC_Net2003
+
+	* MSVC_Net2005/glibmm.sln:
+	* MSVC_Net2005/glibmm/glibmm.vcproj:
+	* MSVC_Net2005/examples/dispatcher/dispatcher.vcproj: Converted to
+	project files for Visual Studio 2005.
+
+	* MSVC_Net2005/glibmm/glibmm.rc.in: Removed the #include "resource.h"
+	since there is no resource.h in the project, and the resource still
+	seems to compile.
+
+	* MSVC_Net2005/giomm/giomm.rc.in:
+	* MSVC_Net2005/giomm/giomm.vcproj:
+	* MSVC_Net2005/giomm/Makefile.am: Added giomm to the MSVC project.
+
+	* MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj:
+	* MSVC_Net2005/tests/giomm_simple/Makefile.am: Added giomm_simple to
+	the MSVC project.
+
+	* MSVC_Net2005/tests/Makefile.am:
+	* MSVC_Net2005/Makefile.am:
+	* Makefile.am:
+	* configure.in: Adapted build files.
+
 === 2.17.2 ===
 
 2008-08-06  Jonathon Jongsma  <jonathon.jongsma@collabora.co.uk>
diff --git a/MSVC_Net2003/Makefile.am b/MSVC_Net2003/Makefile.am
deleted file mode 100644
index 11f3ce0f..00000000
--- a/MSVC_Net2003/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = gendef glibmm examples tests
-
-EXTRA_DIST = blank.cpp glibmm.sln README
diff --git a/MSVC_Net2003/tests/Makefile.am b/MSVC_Net2003/tests/Makefile.am
deleted file mode 100644
index 4b7007dd..00000000
--- a/MSVC_Net2003/tests/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = glibmm_value
-
-
-
diff --git a/MSVC_Net2005/Makefile.am b/MSVC_Net2005/Makefile.am
new file mode 100644
index 00000000..4a9d1852
--- /dev/null
+++ b/MSVC_Net2005/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = gendef glibmm giomm examples tests
+
+EXTRA_DIST = blank.cpp glibmm.sln README
diff --git a/MSVC_Net2003/README b/MSVC_Net2005/README
index a269667c..a269667c 100644
--- a/MSVC_Net2003/README
+++ b/MSVC_Net2005/README
diff --git a/MSVC_Net2003/blank.cpp b/MSVC_Net2005/blank.cpp
index 98feb663..98feb663 100644
--- a/MSVC_Net2003/blank.cpp
+++ b/MSVC_Net2005/blank.cpp
diff --git a/MSVC_Net2003/examples/Makefile.am b/MSVC_Net2005/examples/Makefile.am
index 7e882e1d..7e882e1d 100644
--- a/MSVC_Net2003/examples/Makefile.am
+++ b/MSVC_Net2005/examples/Makefile.am
diff --git a/MSVC_Net2003/examples/dispatcher/Makefile.am b/MSVC_Net2005/examples/dispatcher/Makefile.am
index b73bc99c..b73bc99c 100644
--- a/MSVC_Net2003/examples/dispatcher/Makefile.am
+++ b/MSVC_Net2005/examples/dispatcher/Makefile.am
diff --git a/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj b/MSVC_Net2005/examples/dispatcher/dispatcher.vcproj
index 16006f62..2bd62e7f 100755
--- a/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj
+++ b/MSVC_Net2005/examples/dispatcher/dispatcher.vcproj
@@ -63,7 +63,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="gthread-2.0.lib sigc-2.0d.lib"

+				AdditionalDependencies="glib-2.0.lib gthread-2.0.lib sigc-2.0d.lib"

 				OutputFile="$(OutDir)/dispatcher.exe"

 				LinkIncremental="2"

 				GenerateManifest="true"

@@ -142,7 +142,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="gthread-2.0.lib sigc-2.0.lib"

+				AdditionalDependencies="glib-2.0.lib gthread-2.0.lib sigc-2.0.lib"

 				OutputFile="$(OutDir)/dispatcher.exe"

 				LinkIncremental="1"

 				GenerateManifest="true"

diff --git a/MSVC_Net2003/examples/dispatcher2/Makefile.am b/MSVC_Net2005/examples/dispatcher2/Makefile.am
index 8aafacb7..8aafacb7 100644
--- a/MSVC_Net2003/examples/dispatcher2/Makefile.am
+++ b/MSVC_Net2005/examples/dispatcher2/Makefile.am
diff --git a/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj b/MSVC_Net2005/examples/dispatcher2/dispatcher2.vcproj
index ebac10b6..ebac10b6 100755
--- a/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj
+++ b/MSVC_Net2005/examples/dispatcher2/dispatcher2.vcproj
diff --git a/MSVC_Net2003/examples/markup/Makefile.am b/MSVC_Net2005/examples/markup/Makefile.am
index de7bc5f7..de7bc5f7 100644
--- a/MSVC_Net2003/examples/markup/Makefile.am
+++ b/MSVC_Net2005/examples/markup/Makefile.am
diff --git a/MSVC_Net2003/examples/markup/markup.vcproj b/MSVC_Net2005/examples/markup/markup.vcproj
index 4d2bdc5d..4d2bdc5d 100755
--- a/MSVC_Net2003/examples/markup/markup.vcproj
+++ b/MSVC_Net2005/examples/markup/markup.vcproj
diff --git a/MSVC_Net2003/examples/options/Makefile.am b/MSVC_Net2005/examples/options/Makefile.am
index 91d27e51..91d27e51 100644
--- a/MSVC_Net2003/examples/options/Makefile.am
+++ b/MSVC_Net2005/examples/options/Makefile.am
diff --git a/MSVC_Net2003/examples/options/options.vcproj b/MSVC_Net2005/examples/options/options.vcproj
index 8a9ff959..8a9ff959 100755
--- a/MSVC_Net2003/examples/options/options.vcproj
+++ b/MSVC_Net2005/examples/options/options.vcproj
diff --git a/MSVC_Net2003/examples/thread/Makefile.am b/MSVC_Net2005/examples/thread/Makefile.am
index 93a41289..93a41289 100644
--- a/MSVC_Net2003/examples/thread/Makefile.am
+++ b/MSVC_Net2005/examples/thread/Makefile.am
diff --git a/MSVC_Net2003/examples/thread/thread.vcproj b/MSVC_Net2005/examples/thread/thread.vcproj
index bf481040..bf481040 100755
--- a/MSVC_Net2003/examples/thread/thread.vcproj
+++ b/MSVC_Net2005/examples/thread/thread.vcproj
diff --git a/MSVC_Net2003/examples/thread_pool/Makefile.am b/MSVC_Net2005/examples/thread_pool/Makefile.am
index b0759e7c..b0759e7c 100644
--- a/MSVC_Net2003/examples/thread_pool/Makefile.am
+++ b/MSVC_Net2005/examples/thread_pool/Makefile.am
diff --git a/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj b/MSVC_Net2005/examples/thread_pool/thread_pool.vcproj
index bff1cd52..bff1cd52 100755
--- a/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj
+++ b/MSVC_Net2005/examples/thread_pool/thread_pool.vcproj
diff --git a/MSVC_Net2003/gendef/Makefile.am b/MSVC_Net2005/gendef/Makefile.am
index 3a435c34..3a435c34 100644
--- a/MSVC_Net2003/gendef/Makefile.am
+++ b/MSVC_Net2005/gendef/Makefile.am
diff --git a/MSVC_Net2003/gendef/gendef.cc b/MSVC_Net2005/gendef/gendef.cc
index cf665604..cf665604 100755
--- a/MSVC_Net2003/gendef/gendef.cc
+++ b/MSVC_Net2005/gendef/gendef.cc
diff --git a/MSVC_Net2003/gendef/gendef.vcproj b/MSVC_Net2005/gendef/gendef.vcproj
index f1a1bf7e..f1a1bf7e 100755
--- a/MSVC_Net2003/gendef/gendef.vcproj
+++ b/MSVC_Net2005/gendef/gendef.vcproj
diff --git a/MSVC_Net2005/giomm/Makefile.am b/MSVC_Net2005/giomm/Makefile.am
new file mode 100644
index 00000000..f7d10f9a
--- /dev/null
+++ b/MSVC_Net2005/giomm/Makefile.am
@@ -0,0 +1,12 @@
+BUILT_SOURCES = giommconfig.h giomm.rc
+
+MAINTAINERCLEANFILES = $(built_sources)
+
+EXTRA_DIST = giommconfig.h giomm.vcproj giomm.rc
+
+# Copy config file generated by the configure script. Dependency is
+# wht respect to the .h.in file, to prevent an error with 'make distcheck'.
+# See http://sources.redhat.com/automake/automake.html#distcleancheck
+
+giommconfig.h: $(top_srcdir)/gio/giommconfig.h.in $(top_srcdir)/configure.in
+	cp -f $(top_builddir)/gio/giommconfig.h $@
diff --git a/MSVC_Net2005/giomm/giomm.rc.in b/MSVC_Net2005/giomm/giomm.rc.in
new file mode 100644
index 00000000..102d65c0
--- /dev/null
+++ b/MSVC_Net2005/giomm/giomm.rc.in
@@ -0,0 +1,71 @@
+

+#define APSTUDIO_READONLY_SYMBOLS

+

+#include "afxres.h"

+

+#undef APSTUDIO_READONLY_SYMBOLS

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

+

+#ifdef APSTUDIO_INVOKED

+

+1 TEXTINCLUDE 

+BEGIN

+    "resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1

+ PRODUCTVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x2L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "040904b0"

+        BEGIN

+            VALUE "CompanyName", "The glibmm development team (see AUTHORS)"

+            VALUE "FileDescription", "The official C++ wrapper for gio"

+            VALUE "FileVersion", "@VERSION@"

+            VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"

+            VALUE "OriginalFilename", "giomm-2.4"

+            VALUE "ProductName", "giomm"

+            VALUE "ProductVersion", "@VERSION@"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x409, 1200

+    END

+END

+

+#endif    // English (U.S.) resources

+

+#ifndef APSTUDIO_INVOKED

+

+#endif    // not APSTUDIO_INVOKED

diff --git a/MSVC_Net2005/giomm/giomm.vcproj b/MSVC_Net2005/giomm/giomm.vcproj
new file mode 100644
index 00000000..10678f30
--- /dev/null
+++ b/MSVC_Net2005/giomm/giomm.vcproj
@@ -0,0 +1,496 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="giomm-2.4"

+	ProjectGUID="{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/vd2"

+				Optimization="0"

+				AdditionalIncludeDirectories=".;../..;../../glib;../../gio"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GIOMM_BUILD"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				WarningLevel="3"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Generate giomm def file"

+				CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib gio-2.0.lib sigc-2.0d.lib"

+				OutputFile="$(OutDir)\$(ProjectName)d.dll"

+				ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"

+				GenerateDebugInformation="true"

+			/>

+			<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="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/vd2"

+				AdditionalIncludeDirectories=".;../..;../../glib;../../gio"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GIOMM_BUILD"

+				RuntimeLibrary="2"

+				WarningLevel="3"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+				Description="Generate giomm def file"

+				CommandLine="$(SolutionDir)gendef\$(ConfigurationName)\gendef $(ConfigurationName)\$(InputName).def $(TargetFileName) $(IntDir)\*.obj"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib gio-2.0.lib sigc-2.0.lib"

+				ModuleDefinitionFile="$(ConfigurationName)\$(InputName).def"

+			/>

+			<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\giomm\appinfo.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\asyncresult.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\blank.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\bufferedinputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\bufferedoutputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\cancellable.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\contenttype.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\datainputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\dataoutputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\drive.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\enums.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\error.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\file.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileattributeinfo.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileattributeinfolist.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileenumerator.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileicon.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileinfo.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileinputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\filemonitor.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\filenamecompleter.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileoutputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\filterinputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\filteroutputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\icon.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\init.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\inputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\loadableicon.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\memoryinputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\mount.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\mountoperation.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\outputstream.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\seekable.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\slot_async.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\themedicon.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\volume.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\volumemonitor.cc"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\wrap_init.cc"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+			>

+			<File

+				RelativePath="..\..\gio\giomm\appinfo.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\asyncresult.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\bufferedinputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\bufferedoutputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\cancellable.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\contenttype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\datainputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\dataoutputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\drive.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\enums.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\error.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\file.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileattributeinfo.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileattributeinfolist.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileenumerator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileicon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileinfo.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileinputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\filemonitor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\filenamecompleter.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\fileoutputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\filterinputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\filteroutputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\icon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\init.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\inputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\loadableicon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\memoryinputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\mount.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\mountoperation.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\outputstream.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\seekable.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\slot_async.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\themedicon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\volume.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\volumemonitor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\gio\giomm\wrap_init.h"

+				>

+			</File>

+		</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=".\giomm.rc"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/MSVC_Net2003/glibmm.sln b/MSVC_Net2005/glibmm.sln
index 486f5112..8120b96c 100755
--- a/MSVC_Net2003/glibmm.sln
+++ b/MSVC_Net2005/glibmm.sln
@@ -1,89 +1,110 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm-2.4", "glibmm\glibmm.vcproj", "{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_markup", "examples\markup\markup.vcproj", "{6300FCFA-97F1-4967-802E-E354D95DB0EB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_glibmm_value", "tests\glibmm_value\glibmm_value.vcproj", "{22277003-3228-486E-A6A8-994B8B13AF30}"
-	ProjectSection(ProjectDependencies) = postProject
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread", "examples\thread\thread.vcproj", "{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread_pool", "examples\thread_pool\thread_pool.vcproj", "{962484DB-2111-48A4-BEF0-194433719D0D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher", "examples\dispatcher\dispatcher.vcproj", "{129ECC08-6D30-4884-B824-4AF96EF0A45C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher2", "examples\dispatcher2\dispatcher2.vcproj", "{18A82706-B645-4DF5-AB09-06B90128BAC5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_options", "examples\options\options.vcproj", "{46962B9A-C5E9-4863-9408-97514D63F420}"
-	ProjectSection(ProjectDependencies) = postProject
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.Build.0 = Debug|Win32
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.ActiveCfg = Release|Win32
-		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.Build.0 = Release|Win32
-		{07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.ActiveCfg = Debug|Win32
-		{07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.Build.0 = Debug|Win32
-		{07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.ActiveCfg = Release|Win32
-		{07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.Build.0 = Release|Win32
-		{6300FCFA-97F1-4967-802E-E354D95DB0EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6300FCFA-97F1-4967-802E-E354D95DB0EB}.Debug|Win32.Build.0 = Debug|Win32
-		{6300FCFA-97F1-4967-802E-E354D95DB0EB}.Release|Win32.ActiveCfg = Release|Win32
-		{6300FCFA-97F1-4967-802E-E354D95DB0EB}.Release|Win32.Build.0 = Release|Win32
-		{22277003-3228-486E-A6A8-994B8B13AF30}.Debug|Win32.ActiveCfg = Debug|Win32
-		{22277003-3228-486E-A6A8-994B8B13AF30}.Debug|Win32.Build.0 = Debug|Win32
-		{22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.ActiveCfg = Release|Win32
-		{22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.Build.0 = Release|Win32
-		{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.Build.0 = Debug|Win32
-		{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.ActiveCfg = Release|Win32
-		{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.Build.0 = Release|Win32
-		{962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.Build.0 = Debug|Win32
-		{962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.ActiveCfg = Release|Win32
-		{962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.Build.0 = Release|Win32
-		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.Build.0 = Debug|Win32
-		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.ActiveCfg = Release|Win32
-		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.Build.0 = Release|Win32
-		{18A82706-B645-4DF5-AB09-06B90128BAC5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{18A82706-B645-4DF5-AB09-06B90128BAC5}.Debug|Win32.Build.0 = Debug|Win32
-		{18A82706-B645-4DF5-AB09-06B90128BAC5}.Release|Win32.ActiveCfg = Release|Win32
-		{18A82706-B645-4DF5-AB09-06B90128BAC5}.Release|Win32.Build.0 = Release|Win32
-		{46962B9A-C5E9-4863-9408-97514D63F420}.Debug|Win32.ActiveCfg = Debug|Win32
-		{46962B9A-C5E9-4863-9408-97514D63F420}.Release|Win32.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm-2.4", "glibmm\glibmm.vcproj", "{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"

+	ProjectSection(ProjectDependencies) = postProject

+		{07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_markup", "examples\markup\markup.vcproj", "{6300FCFA-97F1-4967-802E-E354D95DB0EB}"

+	ProjectSection(ProjectDependencies) = postProject

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_glibmm_value", "tests\glibmm_value\glibmm_value.vcproj", "{22277003-3228-486E-A6A8-994B8B13AF30}"

+	ProjectSection(ProjectDependencies) = postProject

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread", "examples\thread\thread.vcproj", "{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}"

+	ProjectSection(ProjectDependencies) = postProject

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread_pool", "examples\thread_pool\thread_pool.vcproj", "{962484DB-2111-48A4-BEF0-194433719D0D}"

+	ProjectSection(ProjectDependencies) = postProject

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher", "examples\dispatcher\dispatcher.vcproj", "{129ECC08-6D30-4884-B824-4AF96EF0A45C}"

+	ProjectSection(ProjectDependencies) = postProject

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher2", "examples\dispatcher2\dispatcher2.vcproj", "{18A82706-B645-4DF5-AB09-06B90128BAC5}"

+	ProjectSection(ProjectDependencies) = postProject

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_options", "examples\options\options.vcproj", "{46962B9A-C5E9-4863-9408-97514D63F420}"

+	ProjectSection(ProjectDependencies) = postProject

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giomm-2.4", "giomm\giomm.vcproj", "{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}"

+	ProjectSection(ProjectDependencies) = postProject

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_giomm_simple", "tests\giomm_simple\giomm_simple.vcproj", "{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}"

+	ProjectSection(ProjectDependencies) = postProject

+		{EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}

+	EndProjectSection

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.Build.0 = Debug|Win32

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.ActiveCfg = Release|Win32

+		{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.Build.0 = Release|Win32

+		{07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.ActiveCfg = Debug|Win32

+		{07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.Build.0 = Debug|Win32

+		{07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.ActiveCfg = Release|Win32

+		{07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.Build.0 = Release|Win32

+		{6300FCFA-97F1-4967-802E-E354D95DB0EB}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6300FCFA-97F1-4967-802E-E354D95DB0EB}.Debug|Win32.Build.0 = Debug|Win32

+		{6300FCFA-97F1-4967-802E-E354D95DB0EB}.Release|Win32.ActiveCfg = Release|Win32

+		{6300FCFA-97F1-4967-802E-E354D95DB0EB}.Release|Win32.Build.0 = Release|Win32

+		{22277003-3228-486E-A6A8-994B8B13AF30}.Debug|Win32.ActiveCfg = Debug|Win32

+		{22277003-3228-486E-A6A8-994B8B13AF30}.Debug|Win32.Build.0 = Debug|Win32

+		{22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.ActiveCfg = Release|Win32

+		{22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.Build.0 = Release|Win32

+		{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.Build.0 = Debug|Win32

+		{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.ActiveCfg = Release|Win32

+		{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.Build.0 = Release|Win32

+		{962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.ActiveCfg = Debug|Win32

+		{962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.Build.0 = Debug|Win32

+		{962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.ActiveCfg = Release|Win32

+		{962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.Build.0 = Release|Win32

+		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.Build.0 = Debug|Win32

+		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.ActiveCfg = Release|Win32

+		{129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.Build.0 = Release|Win32

+		{18A82706-B645-4DF5-AB09-06B90128BAC5}.Debug|Win32.ActiveCfg = Debug|Win32

+		{18A82706-B645-4DF5-AB09-06B90128BAC5}.Debug|Win32.Build.0 = Debug|Win32

+		{18A82706-B645-4DF5-AB09-06B90128BAC5}.Release|Win32.ActiveCfg = Release|Win32

+		{18A82706-B645-4DF5-AB09-06B90128BAC5}.Release|Win32.Build.0 = Release|Win32

+		{46962B9A-C5E9-4863-9408-97514D63F420}.Debug|Win32.ActiveCfg = Debug|Win32

+		{46962B9A-C5E9-4863-9408-97514D63F420}.Debug|Win32.Build.0 = Debug|Win32

+		{46962B9A-C5E9-4863-9408-97514D63F420}.Release|Win32.ActiveCfg = Release|Win32

+		{46962B9A-C5E9-4863-9408-97514D63F420}.Release|Win32.Build.0 = Release|Win32

+		{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}.Debug|Win32.ActiveCfg = Debug|Win32

+		{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}.Debug|Win32.Build.0 = Debug|Win32

+		{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}.Release|Win32.ActiveCfg = Release|Win32

+		{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}.Release|Win32.Build.0 = Release|Win32

+		{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}.Debug|Win32.Build.0 = Debug|Win32

+		{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}.Release|Win32.ActiveCfg = Release|Win32

+		{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/MSVC_Net2003/glibmm/Makefile.am b/MSVC_Net2005/glibmm/Makefile.am
index a0f8c416..a0f8c416 100644
--- a/MSVC_Net2003/glibmm/Makefile.am
+++ b/MSVC_Net2005/glibmm/Makefile.am
diff --git a/MSVC_Net2003/glibmm/glibmm.rc.in b/MSVC_Net2005/glibmm/glibmm.rc.in
index d2d7773f..cc73532b 100755
--- a/MSVC_Net2003/glibmm/glibmm.rc.in
+++ b/MSVC_Net2005/glibmm/glibmm.rc.in
@@ -1,4 +1,3 @@
-#include "resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 

diff --git a/MSVC_Net2003/glibmm/glibmm.vcproj b/MSVC_Net2005/glibmm/glibmm.vcproj
index 21a9f6a9..3838e98b 100755
--- a/MSVC_Net2003/glibmm/glibmm.vcproj
+++ b/MSVC_Net2005/glibmm/glibmm.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"

 				AdditionalOptions="/vd2"

 				Optimization="0"

-				AdditionalIncludeDirectories=".;../../glib"

+				AdditionalIncludeDirectories=".;../..;../../glib"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -124,7 +124,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/vd2"

-				AdditionalIncludeDirectories=".;../../glib"

+				AdditionalIncludeDirectories=".;../..;../../glib"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD"

 				RuntimeLibrary="2"

 				RuntimeTypeInfo="true"

@@ -190,6 +190,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\glib\glibmm\checksum.cc"

+				>

+			</File>

+			<File

 				RelativePath="..\..\glib\glibmm\class.cc"

 				>

 			</File>

@@ -392,6 +396,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\glib\glibmm\checksum.h"

+				>

+			</File>

+			<File

 				RelativePath="..\..\glib\glibmm\class.h"

 				>

 			</File>

@@ -528,11 +536,11 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\glib\glibmm\regex.h"

+				RelativePath="..\..\glib\glibmm\refptr.h"

 				>

 			</File>

 			<File

-				RelativePath="..\..\glib\glibmm\refptr.h"

+				RelativePath="..\..\glib\glibmm\regex.h"

 				>

 			</File>

 			<File

diff --git a/MSVC_Net2005/tests/Makefile.am b/MSVC_Net2005/tests/Makefile.am
new file mode 100644
index 00000000..a442a190
--- /dev/null
+++ b/MSVC_Net2005/tests/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = glibmm_value giomm_simple
+
+
+
diff --git a/MSVC_Net2005/tests/giomm_simple/Makefile.am b/MSVC_Net2005/tests/giomm_simple/Makefile.am
new file mode 100644
index 00000000..db07adbc
--- /dev/null
+++ b/MSVC_Net2005/tests/giomm_simple/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = giomm_simple.vcproj
diff --git a/MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj b/MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj
new file mode 100644
index 00000000..47fb16b7
--- /dev/null
+++ b/MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="tests_giomm_simple"

+	ProjectGUID="{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}"

+	RootNamespace="tests_giomm_simple"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\glib&quot;;&quot;$(SolutionDir)\..\gio&quot;"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)/giomm_simple.exe"

+				LinkIncremental="2"

+				GenerateManifest="true"

+				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"

+				SubSystem="1"

+				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="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\glib&quot;;&quot;$(SolutionDir)\..\gio&quot;"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				RuntimeLibrary="2"

+				RuntimeTypeInfo="true"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="true"

+				DebugInformationFormat="3"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)/giomm_simple.exe"

+				LinkIncremental="1"

+				GenerateManifest="true"

+				GenerateDebugInformation="true"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				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;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+			>

+			<File

+				RelativePath="..\..\blank.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\tests\giomm_simple\main.cc"

+				>

+			</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"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+			>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/MSVC_Net2003/tests/glibmm_value/Makefile.am b/MSVC_Net2005/tests/glibmm_value/Makefile.am
index d4f28507..d4f28507 100644
--- a/MSVC_Net2003/tests/glibmm_value/Makefile.am
+++ b/MSVC_Net2005/tests/glibmm_value/Makefile.am
diff --git a/MSVC_Net2003/tests/glibmm_value/glibmm_value.vcproj b/MSVC_Net2005/tests/glibmm_value/glibmm_value.vcproj
index 24be953b..24be953b 100755
--- a/MSVC_Net2003/tests/glibmm_value/glibmm_value.vcproj
+++ b/MSVC_Net2005/tests/glibmm_value/glibmm_value.vcproj
diff --git a/Makefile.am b/Makefile.am
index 1fb3b8de..22fc0519 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS	= -I scripts
 
-SUBDIRS		= tools glib gio examples scripts tests MSVC_Net2003 docs
+SUBDIRS		= tools glib gio examples scripts tests MSVC_Net2005 docs
 DIST_SUBDIRS	= $(SUBDIRS)
 
 EXTRA_DIST	= build_shared/Makefile_build.am_fragment \
diff --git a/configure.in b/configure.in
index 1a075b18..b8aa6cf5 100644
--- a/configure.in
+++ b/configure.in
@@ -329,19 +329,22 @@ AC_CONFIG_FILES([
 ])
 
 AC_CONFIG_FILES([
-  MSVC_Net2003/Makefile
-    MSVC_Net2003/gendef/Makefile
-    MSVC_Net2003/glibmm/Makefile
-    MSVC_Net2003/glibmm/glibmm.rc
-    MSVC_Net2003/examples/Makefile
-      MSVC_Net2003/examples/dispatcher/Makefile
-      MSVC_Net2003/examples/dispatcher2/Makefile
-      MSVC_Net2003/examples/markup/Makefile
-      MSVC_Net2003/examples/options/Makefile
-      MSVC_Net2003/examples/thread/Makefile      
-      MSVC_Net2003/examples/thread_pool/Makefile
-    MSVC_Net2003/tests/Makefile
-      MSVC_Net2003/tests/glibmm_value/Makefile
+  MSVC_Net2005/Makefile
+    MSVC_Net2005/gendef/Makefile
+    MSVC_Net2005/glibmm/Makefile
+    MSVC_Net2005/glibmm/glibmm.rc
+    MSVC_Net2005/giomm/Makefile
+    MSVC_Net2005/giomm/giomm.rc
+    MSVC_Net2005/examples/Makefile
+      MSVC_Net2005/examples/dispatcher/Makefile
+      MSVC_Net2005/examples/dispatcher2/Makefile
+      MSVC_Net2005/examples/markup/Makefile
+      MSVC_Net2005/examples/options/Makefile
+      MSVC_Net2005/examples/thread/Makefile      
+      MSVC_Net2005/examples/thread_pool/Makefile
+    MSVC_Net2005/tests/Makefile
+      MSVC_Net2005/tests/glibmm_value/Makefile
+      MSVC_Net2005/tests/giomm_simple/Makefile
 ])
 
 AC_OUTPUT()