[glibmm] Update and Overhaul Visual Studio 2005 Projects



commit e49299e014a3e405fa3f80c1ee3195172db36fc1
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Sep 15 17:35:43 2014 +0800

    Update and Overhaul Visual Studio 2005 Projects
    
    Give the Visual Studio 2005 projects, like the Visual Studio 2008 projects
    in the previous commits, a much-needed overhaul and cleanup, so to ease
    future maintenance, by consolidating commonly-used items into property
    sheets.
    
        * MSVC_Net2005/glibmm-build-defines.vsprops:
        * MSVC_Net2005/glibmm-version-paths.vsprops: New property sheets to
          consolidate commonly-used items, so that they can be referred to
          from the projects and changes to them will only have to be done
          here, which will greatly simplify maintenace of the projects.
        * MSVC_Net2005/glibmm/glibmm.vcproj:
        * MSVC_Net2005/giomm/giomm.vcproj:
          and clean up by making use of the newly-added property sheets.
          Update the paths accordingly.  Remove unwanted/unneeded items in
          them as well.
        * MSVC_Net2005/examples/*/*.vcproj:
        * MSVC_Net2005/tests/*/*.vcproj:
          MSVC_Net2005/, and adjust the file paths in them accordingly.
          Clean up by using the property sheets, and remove unwanted/
          unneeded items.  Remove the example_ and test_ prefixes from the
          project names, and correct the source file names for the
          socket-client and socket-server projects
        * MSVC_Net2005/glibmm.sln: Update project names and paths
          accordingly.
        * MSVC_Net2005/filelist.am: Update file names and paths accordingly

 MSVC_Net2005/{examples/compose => }/compose.vcproj |   52 +--
 .../{gendef/gendef.vcproj => dispatcher.vcproj}    |   53 ++--
 .../{examples/dispatcher2 => }/dispatcher2.vcproj  |   50 +--
 MSVC_Net2005/examples/dispatcher/dispatcher.vcproj |  192 ---------
 MSVC_Net2005/examples/properties/properties.vcproj |  192 ---------
 MSVC_Net2005/examples/resolver/resolver.vcproj     |  192 ---------
 .../examples/socket-client/socket-client.vcproj    |  192 ---------
 .../examples/socket-server/socket-server.vcproj    |  192 ---------
 MSVC_Net2005/filelist.am                           |   38 +-
 MSVC_Net2005/{gendef => }/gendef.vcproj            |   32 +-
 MSVC_Net2005/giomm.vcproj                          |  408 ++++++++++++++++++
 MSVC_Net2005/giomm/giomm.vcproj                    |  443 --------------------
 .../{gendef/gendef.vcproj => giomm_simple.vcproj}  |   53 ++--
 MSVC_Net2005/glibmm-build-defines.vsprops          |   36 ++
 MSVC_Net2005/glibmm-version-paths.vsprops          |   39 ++
 MSVC_Net2005/glibmm.sln                            |   36 +-
 MSVC_Net2005/glibmm.vcproj                         |  327 +++++++++++++++
 MSVC_Net2005/glibmm/glibmm.vcproj                  |  371 ----------------
 .../{tests/glibmm_value => }/glibmm_value.vcproj   |   46 +--
 MSVC_Net2005/{examples/keyfile => }/keyfile.vcproj |   52 +--
 MSVC_Net2005/{examples/markup => }/markup.vcproj   |   50 +--
 MSVC_Net2005/{examples/options => }/options.vcproj |   52 +--
 .../{gendef/gendef.vcproj => properties.vcproj}    |   53 ++--
 MSVC_Net2005/{examples/regex => }/regex.vcproj     |   52 +--
 .../{gendef/gendef.vcproj => resolver.vcproj}      |   57 ++--
 .../{gendef/gendef.vcproj => socket-client.vcproj} |   57 ++--
 .../{gendef/gendef.vcproj => socket-server.vcproj} |   57 ++--
 .../tests/giomm_simple/giomm_simple.vcproj         |  188 ---------
 MSVC_Net2005/{examples/thread => }/thread.vcproj   |   50 +--
 .../thread_pool.vcproj => threadpool.vcproj}       |   50 +--
 30 files changed, 1189 insertions(+), 2473 deletions(-)
---
diff --git a/MSVC_Net2005/examples/compose/compose.vcproj b/MSVC_Net2005/compose.vcproj
similarity index 53%
rename from MSVC_Net2005/examples/compose/compose.vcproj
rename to MSVC_Net2005/compose.vcproj
index 55a30f5..d73b70a 100644
--- a/MSVC_Net2005/examples/compose/compose.vcproj
+++ b/MSVC_Net2005/compose.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="examples_compose"
+       Name="compose"
        ProjectGUID="{D6B492E4-591E-405C-8E49-E14B33B2F696}"
-       RootNamespace="examples_compose"
+       RootNamespace="compose"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -20,16 +20,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -42,28 +39,24 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/compose.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -74,9 +67,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/compose.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -88,10 +80,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -101,7 +91,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -114,23 +103,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/compose.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -139,7 +125,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -150,9 +135,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/compose.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -171,8 +155,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\examples\compose\main.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\compose\main.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/gendef/gendef.vcproj b/MSVC_Net2005/dispatcher.vcproj
old mode 100755
new mode 100644
similarity index 67%
copy from MSVC_Net2005/gendef/gendef.vcproj
copy to MSVC_Net2005/dispatcher.vcproj
index 18e4372..4c47974
--- a/MSVC_Net2005/gendef/gendef.vcproj
+++ b/MSVC_Net2005/dispatcher.vcproj
@@ -2,8 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="gendef"
-       ProjectGUID="{07324745-C9BE-4D65-B08A-9C88188C0C28}"
+       Name="dispatcher"
+       ProjectGUID="{129ECC08-6D30-4884-B824-4AF96EF0A45C}"
+       RootNamespace="dispatcher"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -19,10 +20,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -31,7 +30,8 @@
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -39,27 +39,27 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -67,7 +67,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -79,10 +80,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -95,7 +94,8 @@
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -103,21 +103,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -127,7 +126,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -135,7 +135,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -154,8 +155,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\blank.cpp" />
-                       <File RelativePath=".\gendef.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\thread\dispatcher.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/examples/dispatcher2/dispatcher2.vcproj b/MSVC_Net2005/dispatcher2.vcproj
old mode 100755
new mode 100644
similarity index 53%
rename from MSVC_Net2005/examples/dispatcher2/dispatcher2.vcproj
rename to MSVC_Net2005/dispatcher2.vcproj
index e5f2c48..25f7a65
--- a/MSVC_Net2005/examples/dispatcher2/dispatcher2.vcproj
+++ b/MSVC_Net2005/dispatcher2.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="examples_dispatcher2"
+       Name="dispatcher2"
        ProjectGUID="{18A82706-B645-4DF5-AB09-06B90128BAC5}"
        Keyword="Win32Proj"
        >
@@ -19,16 +19,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -41,28 +38,24 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-d-2_0.lib"
-                               OutputFile="$(OutDir)/dispatcher2.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -73,10 +66,9 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-2_0.lib"
-                               OutputFile="$(OutDir)/dispatcher2.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
                                SubSystem="1"
@@ -87,10 +79,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -100,7 +90,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -113,23 +102,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-d-2_0.lib"
-                               OutputFile="$(OutDir)/dispatcher2.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -138,7 +124,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -149,10 +134,9 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-2_0.lib"
-                               OutputFile="$(OutDir)/dispatcher2.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
                                SubSystem="1"
@@ -170,8 +154,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\examples\thread\dispatcher2.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\thread\dispatcher2.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/filelist.am b/MSVC_Net2005/filelist.am
index fdb8c3a..07d69d7 100644
--- a/MSVC_Net2005/filelist.am
+++ b/MSVC_Net2005/filelist.am
@@ -4,26 +4,28 @@ msvc_net2005_data =                                   \
        README                                          \
        blank.cpp                                       \
        glibmm.sln                                      \
-       gendef/gendef.vcproj                            \
+       glibmm-build-defines.vsprops                    \
+       glibmm-version-paths.vsprops                    \
        gendef/gendef.cc                                \
-       glibmm/glibmm.vcproj                            \
+       gendef.vcproj                                   \
+       glibmm.vcproj                                   \
        glibmm/glibmmconfig.h                           \
        glibmm/glibmm.rc                                \
-       giomm/giomm.vcproj                              \
+       giomm.vcproj                                    \
        giomm/giommconfig.h                             \
        giomm/giomm.rc                                  \
-       tests/giomm_simple/giomm_simple.vcproj          \
-       tests/glibmm_value/glibmm_value.vcproj          \
-       examples/compose/compose.vcproj                 \
-       examples/dispatcher/dispatcher.vcproj           \
-       examples/dispatcher2/dispatcher2.vcproj         \
-       examples/markup/markup.vcproj                   \
-       examples/options/options.vcproj                 \
-       examples/thread/thread.vcproj                   \
-       examples/thread_pool/thread_pool.vcproj         \
-       examples/keyfile/keyfile.vcproj                 \
-       examples/properties/properties.vcproj           \
-       examples/regex/regex.vcproj                     \
-       examples/resolver/resolver.vcproj               \
-       examples/socket-client/socket-client.vcproj     \
-       examples/socket-server/socket-server.vcproj
+       giomm_simple.vcproj                             \
+       glibmm_value.vcproj                             \
+       compose.vcproj                                  \
+       dispatcher.vcproj                               \
+       dispatcher2.vcproj                              \
+       markup.vcproj                                   \
+       options.vcproj                                  \
+       thread.vcproj                                   \
+       threadpool.vcproj                               \
+       keyfile.vcproj                                  \
+       properties.vcproj                               \
+       regex.vcproj                                    \
+       resolver.vcproj                                 \
+       socket-client.vcproj                            \
+       socket-server.vcproj
diff --git a/MSVC_Net2005/gendef/gendef.vcproj b/MSVC_Net2005/gendef.vcproj
old mode 100755
new mode 100644
similarity index 71%
copy from MSVC_Net2005/gendef/gendef.vcproj
copy to MSVC_Net2005/gendef.vcproj
index 18e4372..040bc39
--- a/MSVC_Net2005/gendef/gendef.vcproj
+++ b/MSVC_Net2005/gendef.vcproj
@@ -19,10 +19,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -39,21 +37,19 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -67,7 +63,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -79,10 +75,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -103,21 +97,19 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -135,7 +127,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -154,8 +146,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\blank.cpp" />
-                       <File RelativePath=".\gendef.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath=".\gendef\gendef.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/giomm.vcproj b/MSVC_Net2005/giomm.vcproj
new file mode 100644
index 0000000..add24b6
--- /dev/null
+++ b/MSVC_Net2005/giomm.vcproj
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="giomm"
+       ProjectGUID="{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               
AdditionalIncludeDirectories=".\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
+                               PreprocessorDefinitions="_DEBUG;$(GioMMBuildDefs)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate giomm def file"
+                               CommandLine="$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def 
$(TargetFileName) $(IntDir)\*.obj"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll"
+                               ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
+                               GenerateDebugInformation="true"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               
AdditionalIncludeDirectories=".\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
+                               PreprocessorDefinitions="_DEBUG;$(GioMMBuildDefs)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate giomm def file"
+                               CommandLine="$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def 
$(TargetFileName) $(IntDir)\*.obj"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll"
+                               ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
+                               GenerateDebugInformation="true"
+                               TargetMachine="17"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories=".\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
+                               PreprocessorDefinitions="$(GioMMBuildDefs)"
+                               RuntimeLibrary="2"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate giomm def file"
+                               CommandLine="$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def 
$(TargetFileName) $(IntDir)\*.obj"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll"
+                               ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories=".\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
+                               PreprocessorDefinitions="$(GioMMBuildDefs)"
+                               RuntimeLibrary="2"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate giomm def file"
+                               CommandLine="$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def 
$(TargetFileName) $(IntDir)\*.obj"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll"
+                               ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
+                               TargetMachine="17"
+                       />
+               </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="blank.cpp" />
+                       <File RelativePath="..\gio\giomm\action.cc" />
+                       <File RelativePath="..\gio\giomm\actiongroup.cc" />
+                       <File RelativePath="..\gio\giomm\actionmap.cc" />
+                       <File RelativePath="..\gio\giomm\appinfo.cc" />
+                       <File RelativePath="..\gio\giomm\applaunchcontext.cc" />
+                       <File RelativePath="..\gio\giomm\application.cc" />
+                       <File RelativePath="..\gio\giomm\applicationcommandline.cc" />
+                       <File RelativePath="..\gio\giomm\asyncinitable.cc" />
+                       <File RelativePath="..\gio\giomm\asyncresult.cc" />
+                       <File RelativePath="..\gio\giomm\bufferedinputstream.cc" />
+                       <File RelativePath="..\gio\giomm\bufferedoutputstream.cc" />
+                       <File RelativePath="..\gio\giomm\cancellable.cc" />
+                       <File RelativePath="..\gio\giomm\charsetconverter.cc" />
+                       <File RelativePath="..\gio\giomm\contenttype.cc" />
+                       <File RelativePath="..\gio\giomm\converter.cc" />
+                       <File RelativePath="..\gio\giomm\converterinputstream.cc" />
+                       <File RelativePath="..\gio\giomm\converteroutputstream.cc" />
+                       <File RelativePath="..\gio\giomm\credentials.cc" />
+                       <File RelativePath="..\gio\giomm\datainputstream.cc" />
+                       <File RelativePath="..\gio\giomm\dataoutputstream.cc" />
+                       <File RelativePath="..\gio\giomm\dbusactiongroup.cc" />
+                       <File RelativePath="..\gio\giomm\dbusaddress.cc" />
+                       <File RelativePath="..\gio\giomm\dbusauthobserver.cc" />
+                       <File RelativePath="..\gio\giomm\dbusconnection.cc" />
+                       <File RelativePath="..\gio\giomm\dbuserror.cc" />
+                       <File RelativePath="..\gio\giomm\dbuserrorutils.cc" />
+                       <File RelativePath="..\gio\giomm\dbusinterface.cc" />
+                       <File RelativePath="..\gio\giomm\dbusinterfaceskeleton.cc" />
+                       <File RelativePath="..\gio\giomm\dbusinterfacevtable.cc" />
+                       <File RelativePath="..\gio\giomm\dbusintrospection.cc" />
+                       <File RelativePath="..\gio\giomm\dbusmenumodel.cc" />
+                       <File RelativePath="..\gio\giomm\dbusmessage.cc" />
+                       <File RelativePath="..\gio\giomm\dbusmethodinvocation.cc" />
+                       <File RelativePath="..\gio\giomm\dbusobject.cc" />
+                       <File RelativePath="..\gio\giomm\dbusownname.cc" />
+                       <File RelativePath="..\gio\giomm\dbusproxy.cc" />
+                       <File RelativePath="..\gio\giomm\dbusserver.cc" />
+                       <File RelativePath="..\gio\giomm\dbussubtreevtable.cc" />
+                       <File RelativePath="..\gio\giomm\dbusutils.cc" />
+                       <File RelativePath="..\gio\giomm\dbuswatchname.cc" />
+                       <File RelativePath="..\gio\giomm\drive.cc" />
+                       <File RelativePath="..\gio\giomm\emblem.cc" />
+                       <File RelativePath="..\gio\giomm\emblemedicon.cc" />
+                       <File RelativePath="..\gio\giomm\enums.cc" />
+                       <File RelativePath="..\gio\giomm\error.cc" />
+                       <File RelativePath="..\gio\giomm\file.cc" />
+                       <File RelativePath="..\gio\giomm\fileattributeinfo.cc" />
+                       <File RelativePath="..\gio\giomm\fileattributeinfolist.cc" />
+                       <File RelativePath="..\gio\giomm\fileenumerator.cc" />
+                       <File RelativePath="..\gio\giomm\fileicon.cc" />
+                       <File RelativePath="..\gio\giomm\fileinfo.cc" />
+                       <File RelativePath="..\gio\giomm\fileinputstream.cc" />
+                       <File RelativePath="..\gio\giomm\fileiostream.cc" />
+                       <File RelativePath="..\gio\giomm\filemonitor.cc" />
+                       <File RelativePath="..\gio\giomm\filenamecompleter.cc" />
+                       <File RelativePath="..\gio\giomm\fileoutputstream.cc" />
+                       <File RelativePath="..\gio\giomm\filterinputstream.cc" />
+                       <File RelativePath="..\gio\giomm\filteroutputstream.cc" />
+                       <File RelativePath="..\gio\giomm\icon.cc" />
+                       <File RelativePath="..\gio\giomm\inetaddress.cc" />
+                       <File RelativePath="..\gio\giomm\inetsocketaddress.cc" />
+                       <File RelativePath="..\gio\giomm\init.cc" />
+                       <File RelativePath="..\gio\giomm\initable.cc" />
+                       <File RelativePath="..\gio\giomm\inputstream.cc" />
+                       <File RelativePath="..\gio\giomm\iostream.cc" />
+                       <File RelativePath="..\gio\giomm\loadableicon.cc" />
+                       <File RelativePath="..\gio\giomm\memoryinputstream.cc" />
+                       <File RelativePath="..\gio\giomm\memoryoutputstream.cc" />
+                       <File RelativePath="..\gio\giomm\menu.cc" />
+                       <File RelativePath="..\gio\giomm\menuattributeiter.cc" />
+                       <File RelativePath="..\gio\giomm\menuitem.cc" />
+                       <File RelativePath="..\gio\giomm\menulinkiter.cc" />
+                       <File RelativePath="..\gio\giomm\menumodel.cc" />
+                       <File RelativePath="..\gio\giomm\mount.cc" />
+                       <File RelativePath="..\gio\giomm\mountoperation.cc" />
+                       <File RelativePath="..\gio\giomm\networkaddress.cc" />
+                       <File RelativePath="..\gio\giomm\networkservice.cc" />
+                       <File RelativePath="..\gio\giomm\notification.cc" />
+                       <File RelativePath="..\gio\giomm\outputstream.cc" />
+                       <File RelativePath="..\gio\giomm\permission.cc" />
+                       <File RelativePath="..\gio\giomm\pollableinputstream.cc" />
+                       <File RelativePath="..\gio\giomm\pollableoutputstream.cc" />
+                       <File RelativePath="..\gio\giomm\proxy.cc" />
+                       <File RelativePath="..\gio\giomm\proxyaddress.cc" />
+                       <File RelativePath="..\gio\giomm\proxyresolver.cc" />
+                       <File RelativePath="..\gio\giomm\remoteactiongroup.cc" />
+                       <File RelativePath="..\gio\giomm\resolver.cc" />
+                       <File RelativePath="..\gio\giomm\resource.cc" />
+                       <File RelativePath="..\gio\giomm\seekable.cc" />
+                       <File RelativePath="..\gio\giomm\settings.cc" />
+                       <File RelativePath="..\gio\giomm\simpleaction.cc" />
+                       <File RelativePath="..\gio\giomm\simpleactiongroup.cc" />
+                       <File RelativePath="..\gio\giomm\simplepermission.cc" />
+                       <File RelativePath="..\gio\giomm\slot_async.cc" />
+                       <File RelativePath="..\gio\giomm\socket.cc" />
+                       <File RelativePath="..\gio\giomm\socketaddress.cc" />
+                       <File RelativePath="..\gio\giomm\socketaddressenumerator.cc" />
+                       <File RelativePath="..\gio\giomm\socketclient.cc" />
+                       <File RelativePath="..\gio\giomm\socketconnectable.cc" />
+                       <File RelativePath="..\gio\giomm\socketconnection.cc" />
+                       <File RelativePath="..\gio\giomm\socketcontrolmessage.cc" />
+                       <File RelativePath="..\gio\giomm\socketlistener.cc" />
+                       <File RelativePath="..\gio\giomm\socketservice.cc" />
+                       <File RelativePath="..\gio\giomm\socketsource.cc" />
+                       <File RelativePath="..\gio\giomm\srvtarget.cc" />
+                       <File RelativePath="..\gio\giomm\tcpconnection.cc" />
+                       <File RelativePath="..\gio\giomm\themedicon.cc" />
+                       <File RelativePath="..\gio\giomm\threadedsocketservice.cc" />
+                       <File RelativePath="..\gio\giomm\tlscertificate.cc" />
+                       <File RelativePath="..\gio\giomm\tlsclientconnection.cc" />
+                       <File RelativePath="..\gio\giomm\tlsconnection.cc" />
+                       <File RelativePath="..\gio\giomm\tlsdatabase.cc" />
+                       <File RelativePath="..\gio\giomm\tlsinteraction.cc" />
+                       <File RelativePath="..\gio\giomm\tlspassword.cc" />
+                       <File RelativePath="..\gio\giomm\tlsserverconnection.cc" />
+                       <File RelativePath="..\gio\giomm\volume.cc" />
+                       <File RelativePath="..\gio\giomm\volumemonitor.cc" />
+                       <File RelativePath="..\gio\giomm\wrap_init.cc" />
+                       <File RelativePath="..\gio\giomm\zlibcompressor.cc" />
+                       <File RelativePath="..\gio\giomm\zlibdecompressor.cc" />
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File RelativePath="..\gio\giomm\action.h" />
+                       <File RelativePath="..\gio\giomm\actiongroup.h" />
+                       <File RelativePath="..\gio\giomm\actionmap.h" />
+                       <File RelativePath="..\gio\giomm\appinfo.h" />
+                       <File RelativePath="..\gio\giomm\applaunchcontext.h" />
+                       <File RelativePath="..\gio\giomm\application.h" />
+                       <File RelativePath="..\gio\giomm\applicationcommandline.h" />
+                       <File RelativePath="..\gio\giomm\asyncinitable.h" />
+                       <File RelativePath="..\gio\giomm\asyncresult.h" />
+                       <File RelativePath="..\gio\giomm\bufferedinputstream.h" />
+                       <File RelativePath="..\gio\giomm\bufferedoutputstream.h" />
+                       <File RelativePath="..\gio\giomm\cancellable.h" />
+                       <File RelativePath="..\gio\giomm\charsetconverter.h" />
+                       <File RelativePath="..\gio\giomm\contenttype.h" />
+                       <File RelativePath="..\gio\giomm\converter.h" />
+                       <File RelativePath="..\gio\giomm\converterinputstream.h" />
+                       <File RelativePath="..\gio\giomm\converteroutputstream.h" />
+                       <File RelativePath="..\gio\giomm\credentials.h" />
+                       <File RelativePath="..\gio\giomm\datainputstream.h" />
+                       <File RelativePath="..\gio\giomm\dataoutputstream.h" />
+                       <File RelativePath="..\gio\giomm\dbusactiongroup.h" />
+                       <File RelativePath="..\gio\giomm\dbusaddress.h" />
+                       <File RelativePath="..\gio\giomm\dbusauthobserver.h" />
+                       <File RelativePath="..\gio\giomm\dbusconnection.h" />
+                       <File RelativePath="..\gio\giomm\dbuserror.h" />
+                       <File RelativePath="..\gio\giomm\dbuserrorutils.h" />
+                       <File RelativePath="..\gio\giomm\dbusinterface.h" />
+                       <File RelativePath="..\gio\giomm\dbusinterfaceskeleton.h" />
+                       <File RelativePath="..\gio\giomm\dbusinterfacevtable.h" />
+                       <File RelativePath="..\gio\giomm\dbusintrospection.h" />
+                       <File RelativePath="..\gio\giomm\dbusmenumodel.h" />
+                       <File RelativePath="..\gio\giomm\dbusmessage.h" />
+                       <File RelativePath="..\gio\giomm\dbusmethodinvocation.h" />
+                       <File RelativePath="..\gio\giomm\dbusobject.h" />
+                       <File RelativePath="..\gio\giomm\dbusownname.h" />
+                       <File RelativePath="..\gio\giomm\dbusproxy.h" />
+                       <File RelativePath="..\gio\giomm\dbusserver.h" />
+                       <File RelativePath="..\gio\giomm\dbussubtreevtable.h" />
+                       <File RelativePath="..\gio\giomm\dbusutils.h" />
+                       <File RelativePath="..\gio\giomm\dbuswatchname.h" />
+                       <File RelativePath="..\gio\giomm\drive.h" />
+                       <File RelativePath="..\gio\giomm\emblem.h" />
+                       <File RelativePath="..\gio\giomm\emblemedicon.h" />
+                       <File RelativePath="..\gio\giomm\enums.h" />
+                       <File RelativePath="..\gio\giomm\error.h" />
+                       <File RelativePath="..\gio\giomm\file.h" />
+                       <File RelativePath="..\gio\giomm\fileattributeinfo.h" />
+                       <File RelativePath="..\gio\giomm\fileattributeinfolist.h" />
+                       <File RelativePath="..\gio\giomm\fileenumerator.h" />
+                       <File RelativePath="..\gio\giomm\fileicon.h" />
+                       <File RelativePath="..\gio\giomm\fileinfo.h" />
+                       <File RelativePath="..\gio\giomm\fileinputstream.h" />
+                       <File RelativePath="..\gio\giomm\fileiostream.h" />
+                       <File RelativePath="..\gio\giomm\filemonitor.h" />
+                       <File RelativePath="..\gio\giomm\filenamecompleter.h" />
+                       <File RelativePath="..\gio\giomm\fileoutputstream.h" />
+                       <File RelativePath="..\gio\giomm\filterinputstream.h" />
+                       <File RelativePath="..\gio\giomm\filteroutputstream.h" />
+                       <File RelativePath="..\gio\giomm\icon.h" />
+                       <File RelativePath="..\gio\giomm\inetaddress.h" />
+                       <File RelativePath="..\gio\giomm\inetsocketaddress.h" />
+                       <File RelativePath="..\gio\giomm\init.h" />
+                       <File RelativePath="..\gio\giomm\initable.h" />
+                       <File RelativePath="..\gio\giomm\inputstream.h" />
+                       <File RelativePath="..\gio\giomm\iostream.h" />
+                       <File RelativePath="..\gio\giomm\loadableicon.h" />
+                       <File RelativePath="..\gio\giomm\memoryinputstream.h" />
+                       <File RelativePath="..\gio\giomm\memoryoutputstream.h" />
+                       <File RelativePath="..\gio\giomm\menu.h" />
+                       <File RelativePath="..\gio\giomm\menuattributeiter.h" />
+                       <File RelativePath="..\gio\giomm\menuitem.h" />
+                       <File RelativePath="..\gio\giomm\menulinkiter.h" />
+                       <File RelativePath="..\gio\giomm\menumodel.h" />
+                       <File RelativePath="..\gio\giomm\mount.h" />
+                       <File RelativePath="..\gio\giomm\mountoperation.h" />
+                       <File RelativePath="..\gio\giomm\networkaddress.h" />
+                       <File RelativePath="..\gio\giomm\networkservice.h" />
+                       <File RelativePath="..\gio\giomm\notification.h" />
+                       <File RelativePath="..\gio\giomm\outputstream.h" />
+                       <File RelativePath="..\gio\giomm\permission.h" />
+                       <File RelativePath="..\gio\giomm\pollableinputstream.h" />
+                       <File RelativePath="..\gio\giomm\pollableoutputstream.h" />
+                       <File RelativePath="..\gio\giomm\proxy.h" />
+                       <File RelativePath="..\gio\giomm\proxyaddress.h" />
+                       <File RelativePath="..\gio\giomm\proxyresolver.h" />
+                       <File RelativePath="..\gio\giomm\remoteactiongroup.h" />
+                       <File RelativePath="..\gio\giomm\resolver.h" />
+                       <File RelativePath="..\gio\giomm\resource.h" />
+                       <File RelativePath="..\gio\giomm\seekable.h" />
+                       <File RelativePath="..\gio\giomm\settings.h" />
+                       <File RelativePath="..\gio\giomm\simpleaction.h" />
+                       <File RelativePath="..\gio\giomm\simpleactiongroup.h" />
+                       <File RelativePath="..\gio\giomm\simplepermission.h" />
+                       <File RelativePath="..\gio\giomm\slot_async.h" />
+                       <File RelativePath="..\gio\giomm\socket.h" />
+                       <File RelativePath="..\gio\giomm\socketaddress.h" />
+                       <File RelativePath="..\gio\giomm\socketaddressenumerator.h" />
+                       <File RelativePath="..\gio\giomm\socketclient.h" />
+                       <File RelativePath="..\gio\giomm\socketconnectable.h" />
+                       <File RelativePath="..\gio\giomm\socketconnection.h" />
+                       <File RelativePath="..\gio\giomm\socketcontrolmessage.h" />
+                       <File RelativePath="..\gio\giomm\socketlistener.h" />
+                       <File RelativePath="..\gio\giomm\socketservice.h" />
+                       <File RelativePath="..\gio\giomm\srvtarget.h" />
+                       <File RelativePath="..\gio\giomm\tcpconnection.h" />
+                       <File RelativePath="..\gio\giomm\themedicon.h" />
+                       <File RelativePath="..\gio\giomm\threadedsocketservice.h" />
+                       <File RelativePath="..\gio\giomm\tlscertificate.h" />
+                       <File RelativePath="..\gio\giomm\tlsclientconnection.h" />
+                       <File RelativePath="..\gio\giomm\tlsconnection.h" />
+                       <File RelativePath="..\gio\giomm\tlsdatabase.h" />
+                       <File RelativePath="..\gio\giomm\tlsfiledatabase.h" />
+                       <File RelativePath="..\gio\giomm\tlsinteraction.h" />
+                       <File RelativePath="..\gio\giomm\tlspassword.h" />
+                       <File RelativePath="..\gio\giomm\tlsserverconnection.h" />
+                       <File RelativePath="..\gio\giomm\volume.h" />
+                       <File RelativePath="..\gio\giomm\volumemonitor.h" />
+                       <File RelativePath="..\gio\giomm\wrap_init.h" />
+                       <File RelativePath="..\gio\giomm\zlibcompressor.h" />
+                       <File RelativePath="..\gio\giomm\zlibdecompressor.h" />
+               </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\giomm.rc" />
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2005/gendef/gendef.vcproj b/MSVC_Net2005/giomm_simple.vcproj
old mode 100755
new mode 100644
similarity index 67%
copy from MSVC_Net2005/gendef/gendef.vcproj
copy to MSVC_Net2005/giomm_simple.vcproj
index 18e4372..38f7470
--- a/MSVC_Net2005/gendef/gendef.vcproj
+++ b/MSVC_Net2005/giomm_simple.vcproj
@@ -2,8 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="gendef"
-       ProjectGUID="{07324745-C9BE-4D65-B08A-9C88188C0C28}"
+       Name="giomm_simple"
+       ProjectGUID="{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}"
+       RootNamespace="giomm_simple"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -19,19 +20,19 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -39,27 +40,27 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -67,7 +68,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -79,10 +80,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -92,10 +91,12 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -103,21 +104,19 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -126,8 +125,10 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -135,7 +136,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -154,8 +155,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\blank.cpp" />
-                       <File RelativePath=".\gendef.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\tests\giomm_simple\main.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/glibmm-build-defines.vsprops b/MSVC_Net2005/glibmm-build-defines.vsprops
new file mode 100644
index 0000000..ab10bc2
--- /dev/null
+++ b/MSVC_Net2005/glibmm-build-defines.vsprops
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="glibmmbuilddefinesprops"
+       OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+       IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
+       InheritedPropertySheets=".\glibmm-version-paths.vsprops"
+       >
+       <Tool
+               Name="VCCLCompilerTool"
+               
AdditionalIncludeDirectories=".\glibmm;..;..\glib;$(GlibEtcInstallRoot)\include\sigc++-2.0;$(GlibEtcInstallRoot)\lib\sigc++-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
+               ForcedIncludeFiles="msvc_recommended_pragmas.h"
+       />
+       <Tool
+               Name="VCLinkerTool"
+               AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gmodule-2.0.lib"
+               AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+       />
+       <UserMacro
+               Name="CPPDepLibsRelease"
+               Value="sigc-vc$(VSVer)0-2_0.lib"
+       />
+       <UserMacro
+               Name="CPPDepLibsDebug"
+               Value="sigc-vc$(VSVer)0-d-2_0.lib"
+       />
+       <UserMacro
+               Name="GLibMMBuildDefs"
+               Value="GLIBMM_BUILD"
+       />
+       <UserMacro
+               Name="GioMMBuildDefs"
+               Value="GIOMM_BUILD"
+       />
+</VisualStudioPropertySheet>
diff --git a/MSVC_Net2005/glibmm-version-paths.vsprops b/MSVC_Net2005/glibmm-version-paths.vsprops
new file mode 100644
index 0000000..6df10b1
--- /dev/null
+++ b/MSVC_Net2005/glibmm-version-paths.vsprops
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="glibmmversionpathsprops"
+       >
+       <UserMacro
+               Name="VSVer"
+               Value="8"
+       />
+       <UserMacro
+               Name="GlibEtcInstallRoot"
+               Value="$(SolutionDir)\..\..\vs$(VSVer)\$(PlatformName)"
+       />
+       <UserMacro
+               Name="DefDir"
+               Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
+       />
+       <UserMacro
+               Name="CopyDir"
+               Value="$(GlibEtcInstallRoot)"
+       />
+       <UserMacro
+               Name="ApiMajorVersion"
+               Value="2"
+       />
+       <UserMacro
+               Name="ApiMinorVersion"
+               Value="4"
+       />
+       <UserMacro
+               Name="ReleaseDllSuffix"
+               Value="-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)"
+       />
+       <UserMacro
+               Name="DebugDllSuffix"
+               Value="-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)"
+       />
+</VisualStudioPropertySheet>
diff --git a/MSVC_Net2005/glibmm.sln b/MSVC_Net2005/glibmm.sln
index 7d30431..cd77d84 100755
--- a/MSVC_Net2005/glibmm.sln
+++ b/MSVC_Net2005/glibmm.sln
@@ -1,92 +1,92 @@
 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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadpool", "threadpool.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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "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}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giomm_simple", "giomm_simple.vcproj", 
"{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}"
        ProjectSection(ProjectDependencies) = postProject
                {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
                {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_keyfile", "examples\keyfile\keyfile.vcproj", 
"{FA6C9A26-5192-4C19-9527-64DF5C31E2DA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keyfile", "keyfile.vcproj", 
"{FA6C9A26-5192-4C19-9527-64DF5C31E2DA}"
        ProjectSection(ProjectDependencies) = postProject
                {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_properties", 
"examples\properties\properties.vcproj", "{F3CC33A1-C933-4AF2-A05C-4ECE8E41F691}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "properties", "properties.vcproj", 
"{F3CC33A1-C933-4AF2-A05C-4ECE8E41F691}"
        ProjectSection(ProjectDependencies) = postProject
                {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_regex", "examples\regex\regex.vcproj", 
"{9C375338-4B27-452F-A3C5-4122D06E6AE3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcproj", 
"{9C375338-4B27-452F-A3C5-4122D06E6AE3}"
        ProjectSection(ProjectDependencies) = postProject
                {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_resolver", 
"examples\resolver\resolver.vcproj", "{376102F2-3124-4982-9001-E34E521B544D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resolver", "resolver.vcproj", 
"{376102F2-3124-4982-9001-E34E521B544D}"
        ProjectSection(ProjectDependencies) = postProject
                {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
                {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_socket-client", 
"examples\socket-client\socket-client.vcproj", "{6E9F9F84-D02D-4E1F-A4D4-85AC26847120}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket-client", "socket-client.vcproj", 
"{6E9F9F84-D02D-4E1F-A4D4-85AC26847120}"
        ProjectSection(ProjectDependencies) = postProject
                {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
                {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_socket-server", 
"examples\socket-server\socket-server.vcproj", "{9020BBA8-96E3-4587-9107-20BCF3DF5F1F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket-server", "socket-server.vcproj", 
"{9020BBA8-96E3-4587-9107-20BCF3DF5F1F}"
        ProjectSection(ProjectDependencies) = postProject
                {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
                {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_compose", "examples\compose\compose.vcproj", 
"{D6B492E4-591E-405C-8E49-E14B33B2F696}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compose", "compose.vcproj", 
"{D6B492E4-591E-405C-8E49-E14B33B2F696}"
        ProjectSection(ProjectDependencies) = postProject
                {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
        EndProjectSection
diff --git a/MSVC_Net2005/glibmm.vcproj b/MSVC_Net2005/glibmm.vcproj
new file mode 100644
index 0000000..a728d3d
--- /dev/null
+++ b/MSVC_Net2005/glibmm.vcproj
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="glibmm"
+       ProjectGUID="{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
+       RootNamespace="glibmm"
+       Keyword="Win32Proj"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               PreprocessorDefinitions="_DEBUG;$(GLibMMBuildDefs)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="4"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate glibmm def file"
+                               CommandLine="$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def 
$(TargetFileName) $(IntDir)\*.obj"
+                               ExcludedFromBuild="false"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll"
+                               GenerateManifest="true"
+                               ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
+                               GenerateDebugInformation="true"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               PreprocessorDefinitions="_DEBUG;$(GLibMMBuildDefs)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate glibmm def file"
+                               CommandLine="$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def 
$(TargetFileName) $(IntDir)\*.obj"
+                               ExcludedFromBuild="false"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll"
+                               GenerateManifest="true"
+                               ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
+                               GenerateDebugInformation="true"
+                               TargetMachine="17"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="$(GLibMMBuildDefs)"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate glibmm def file"
+                               CommandLine="$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def 
$(TargetFileName) $(IntDir)\*.obj"
+                               ExcludedFromBuild="false"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll"
+                               GenerateManifest="true"
+                               ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="$(GLibMMBuildDefs)"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Generate glibmm def file"
+                               CommandLine="$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def 
$(TargetFileName) $(IntDir)\*.obj"
+                               ExcludedFromBuild="false"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll"
+                               GenerateManifest="true"
+                               ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
+                               TargetMachine="17"
+                       />
+               </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 RelativePath="..\glib\glibmm\arrayhandle.cc" />
+                       <File RelativePath="..\glib\glibmm\balancedtree.cc" />
+                       <File RelativePath="..\glib\glibmm\base64.cc" />
+                       <File RelativePath="..\glib\glibmm\bytes.cc" />
+                       <File RelativePath="..\glib\glibmm\bytearray.cc" />
+                       <File RelativePath="..\glib\glibmm\checksum.cc" />
+                       <File RelativePath="..\glib\glibmm\class.cc" />
+                       <File RelativePath="..\glib\glibmm\containers.cc" />
+                       <File RelativePath="..\glib\glibmm\convert.cc" />
+                       <File RelativePath="..\glib\glibmm\date.cc" />
+                       <File RelativePath="..\glib\glibmm\datetime.cc" />
+                       <File RelativePath="..\glib\glibmm\debug.cc" />
+                       <File RelativePath="..\glib\glibmm\dispatcher.cc" />
+                       <File RelativePath="..\glib\glibmm\error.cc" />
+                       <File RelativePath="..\glib\glibmm\exception.cc" />
+                       <File RelativePath="..\glib\glibmm\exceptionhandler.cc" />
+                       <File RelativePath="..\glib\glibmm\fileutils.cc" />
+                       <File RelativePath="..\glib\glibmm\init.cc" />
+                       <File RelativePath="..\glib\glibmm\interface.cc" />
+                       <File RelativePath="..\glib\glibmm\iochannel.cc" />
+                       <File RelativePath="..\glib\glibmm\keyfile.cc" />
+                       <File RelativePath="..\glib\glibmm\main.cc" />
+                       <File RelativePath="..\glib\glibmm\markup.cc" />
+                       <File RelativePath="..\glib\glibmm\miscutils.cc" />
+                       <File RelativePath="..\glib\glibmm\module.cc" />
+                       <File RelativePath="..\glib\glibmm\nodetree.cc" />
+                       <File RelativePath="..\glib\glibmm\object.cc" />
+                       <File RelativePath="..\glib\glibmm\objectbase.cc" />
+                       <File RelativePath="..\glib\glibmm\optioncontext.cc" />
+                       <File RelativePath="..\glib\glibmm\optionentry.cc" />
+                       <File RelativePath="..\glib\glibmm\optiongroup.cc" />
+                       <File RelativePath="..\glib\glibmm\pattern.cc" />
+                       <File RelativePath="..\glib\glibmm\property.cc" />
+                       <File RelativePath="..\glib\glibmm\propertyproxy.cc" />
+                       <File RelativePath="..\glib\glibmm\propertyproxy_base.cc" />
+                       <File RelativePath="..\glib\glibmm\quark.cc" />
+                       <File RelativePath="..\glib\glibmm\random.cc" />
+                       <File RelativePath="..\glib\glibmm\regex.cc" />
+                       <File RelativePath="..\glib\glibmm\sarray.cc" />
+                       <File RelativePath="..\glib\glibmm\shell.cc" />
+                       <File RelativePath="..\glib\glibmm\signalproxy.cc" />
+                       <File RelativePath="..\glib\glibmm\signalproxy_connectionnode.cc" />
+                       <File RelativePath="..\glib\glibmm\spawn.cc" />
+                       <File RelativePath="..\glib\glibmm\streamiochannel.cc" />
+                       <File RelativePath="..\glib\glibmm\stringutils.cc" />
+                       <File RelativePath="..\glib\glibmm\thread.cc" />
+                       <File RelativePath="..\glib\glibmm\threadpool.cc" />
+                       <File RelativePath="..\glib\glibmm\threads.cc" />
+                       <File RelativePath="..\glib\glibmm\timer.cc" />
+                       <File RelativePath="..\glib\glibmm\timeval.cc" />
+                       <File RelativePath="..\glib\glibmm\timezone.cc" />
+                       <File RelativePath="..\glib\glibmm\unicode.cc" />
+                       <File RelativePath="..\glib\glibmm\uriutils.cc" />
+                       <File RelativePath="..\glib\glibmm\ustring.cc" />
+                       <File RelativePath="..\glib\glibmm\utility.cc" />
+                       <File RelativePath="..\glib\glibmm\value.cc" />
+                       <File RelativePath="..\glib\glibmm\value_basictypes.cc" />
+                       <File RelativePath="..\glib\glibmm\value_custom.cc" />
+                       <File RelativePath="..\glib\glibmm\valuearray.cc" />
+                       <File RelativePath="..\glib\glibmm\variant.cc" />
+                       <File RelativePath="..\glib\glibmm\variantdict.cc" />
+                       <File RelativePath="..\glib\glibmm\variantiter.cc" />
+                       <File RelativePath="..\glib\glibmm\varianttype.cc" />
+                       <File RelativePath="..\glib\glibmm\variant_basictypes.cc" />
+                       <File RelativePath="..\glib\glibmm\vectorutils.cc" />
+                       <File RelativePath="..\glib\glibmm\wrap.cc" />
+                       <File RelativePath="..\glib\glibmm\wrap_init.cc" />
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File RelativePath="..\glib\glibmm\arrayhandle.h" />
+                       <File RelativePath="..\glib\glibmm\balancedtree.h" />
+                       <File RelativePath="..\glib\glibmm\base64.h" />
+                       <File RelativePath="..\glib\glibmm\bytes.h" />
+                       <File RelativePath="..\glib\glibmm\bytearray.h" />
+                       <File RelativePath="..\glib\glibmm\checksum.h" />
+                       <File RelativePath="..\glib\glibmm\class.h" />
+                       <File RelativePath="..\glib\glibmm\containerhandle_shared.h" />
+                       <File RelativePath="..\glib\glibmm\containers.h" />
+                       <File RelativePath="..\glib\glibmm\convert.h" />
+                       <File RelativePath="..\glib\glibmm\date.h" />
+                       <File RelativePath="..\glib\glibmm\datetime.h" />
+                       <File RelativePath="..\glib\glibmm\debug.h" />
+                       <File RelativePath="..\glib\glibmm\dispatcher.h" />
+                       <File RelativePath="..\glib\glibmm\error.h" />
+                       <File RelativePath="..\glib\glibmm\exception.h" />
+                       <File RelativePath="..\glib\glibmm\exceptionhandler.h" />
+                       <File RelativePath="..\glib\glibmm\fileutils.h" />
+                       <File RelativePath="..\glib\glibmm\helperlist.h" />
+                       <File RelativePath="..\glib\glibmm\i18n-lib.h" />
+                       <File RelativePath="..\glib\glibmm\i18n.h" />
+                       <File RelativePath="..\glib\glibmm\init.h" />
+                       <File RelativePath="..\glib\glibmm\interface.h" />
+                       <File RelativePath="..\glib\glibmm\iochannel.h" />
+                       <File RelativePath="..\glib\glibmm\keyfile.h" />
+                       <File RelativePath="..\glib\glibmm\listhandle.h" />
+                       <File RelativePath="..\glib\glibmm\main.h" />
+                       <File RelativePath="..\glib\glibmm\markup.h" />
+                       <File RelativePath="..\glib\glibmm\miscutils.h" />
+                       <File RelativePath="..\glib\glibmm\module.h" />
+                       <File RelativePath="..\glib\glibmm\nodetree.h" />
+                       <File RelativePath="..\glib\glibmm\object.h" />
+                       <File RelativePath="..\glib\glibmm\objectbase.h" />
+                       <File RelativePath="..\glib\glibmm\optioncontext.h" />
+                       <File RelativePath="..\glib\glibmm\optionentry.h" />
+                       <File RelativePath="..\glib\glibmm\optiongroup.h" />
+                       <File RelativePath="..\glib\glibmm\pattern.h" />
+                       <File RelativePath="..\glib\glibmm\property.h" />
+                       <File RelativePath="..\glib\glibmm\propertyproxy.h" />
+                       <File RelativePath="..\glib\glibmm\propertyproxy_base.h" />
+                       <File RelativePath="..\glib\glibmm\quark.h" />
+                       <File RelativePath="..\glib\glibmm\random.h" />
+                       <File RelativePath="..\glib\glibmm\refptr.h" />
+                       <File RelativePath="..\glib\glibmm\regex.h" />
+                       <File RelativePath="..\glib\glibmm\sarray.h" />
+                       <File RelativePath="..\glib\glibmm\shell.h" />
+                       <File RelativePath="..\glib\glibmm\signalproxy.h" />
+                       <File RelativePath="..\glib\glibmm\signalproxy_connectionnode.h" />
+                       <File RelativePath="..\glib\glibmm\slisthandle.h" />
+                       <File RelativePath="..\glib\glibmm\spawn.h" />
+                       <File RelativePath="..\glib\glibmm\streamiochannel.h" />
+                       <File RelativePath="..\glib\glibmm\stringutils.h" />
+                       <File RelativePath="..\glib\glibmm\thread.h" />
+                       <File RelativePath="..\glib\glibmm\threadpool.h" />
+                       <File RelativePath="..\glib\glibmm\threads.h" />
+                       <File RelativePath="..\glib\glibmm\timer.h" />
+                       <File RelativePath="..\glib\glibmm\timeval.h" />
+                       <File RelativePath="..\glib\glibmm\timezone.h" />
+                       <File RelativePath="..\glib\glibmm\unicode.h" />
+                       <File RelativePath="..\glib\glibmm\uriutils.h" />
+                       <File RelativePath="..\glib\glibmm\ustring.h" />
+                       <File RelativePath="..\glib\glibmm\utility.h" />
+                       <File RelativePath="..\glib\glibmm\value.h" />
+                       <File RelativePath="..\glib\glibmm\value_basictypes.h" />
+                       <File RelativePath="..\glib\glibmm\value_custom.h" />
+                       <File RelativePath="..\glib\glibmm\valuearray.h" />
+                       <File RelativePath="..\glib\glibmm\variant.h" />
+                       <File RelativePath="..\glib\glibmm\variantdict.h" />
+                       <File RelativePath="..\glib\glibmm\variantiter.h" />
+                       <File RelativePath="..\glib\glibmm\varianttype.h" />
+                       <File RelativePath="..\glib\glibmm\variant_basictypes.h" />
+                       <File RelativePath="..\glib\glibmm\vectorutils.h" />
+                       <File RelativePath="..\glib\glibmm\wrap.h" />
+                       <File RelativePath="..\glib\glibmm\wrap_init.h" />
+               </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}"
+                       >
+                       <File RelativePath=".\glibmm\glibmm.rc" />
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2005/tests/glibmm_value/glibmm_value.vcproj b/MSVC_Net2005/glibmm_value.vcproj
old mode 100755
new mode 100644
similarity index 54%
rename from MSVC_Net2005/tests/glibmm_value/glibmm_value.vcproj
rename to MSVC_Net2005/glibmm_value.vcproj
index 111a39e..eebb0cb
--- a/MSVC_Net2005/tests/glibmm_value/glibmm_value.vcproj
+++ b/MSVC_Net2005/glibmm_value.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="tests_glibmm_value"
+       Name="glibmm_value"
        ProjectGUID="{22277003-3228-486E-A6A8-994B8B13AF30}"
-       RootNamespace="tests_glibmm_value"
+       RootNamespace="glibmm_value"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -20,16 +20,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -42,27 +39,23 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/glibmm_value.exe"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -73,8 +66,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/glibmm_value.exe"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -86,10 +78,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -99,7 +89,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -112,22 +101,19 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/glibmm_value.exe"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -136,7 +122,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -147,8 +132,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/glibmm_value.exe"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -167,9 +151,9 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\tests\glibmm_value\glibmm_value.cc" />
-                       <File RelativePath="..\..\..\tests\glibmm_value\main.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\tests\glibmm_value\glibmm_value.cc" />
+                       <File RelativePath="..\tests\glibmm_value\main.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/examples/keyfile/keyfile.vcproj b/MSVC_Net2005/keyfile.vcproj
similarity index 52%
rename from MSVC_Net2005/examples/keyfile/keyfile.vcproj
rename to MSVC_Net2005/keyfile.vcproj
index a4db8fc..a519425 100644
--- a/MSVC_Net2005/examples/keyfile/keyfile.vcproj
+++ b/MSVC_Net2005/keyfile.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="examples_keyfile"
+       Name="keyfile"
        ProjectGUID="{FA6C9A26-5192-4C19-9527-64DF5C31E2DA}"
-       RootNamespace="examples_dispatcher"
+       RootNamespace="dispatcher"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -20,16 +20,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -42,28 +39,24 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/keyfile.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -74,9 +67,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/keyfile.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -88,10 +80,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -101,7 +91,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -114,23 +103,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/keyfile.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -139,7 +125,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -150,9 +135,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/keyfile.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -171,8 +155,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\examples\keyfile\main.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\keyfile\main.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/examples/markup/markup.vcproj b/MSVC_Net2005/markup.vcproj
old mode 100755
new mode 100644
similarity index 53%
rename from MSVC_Net2005/examples/markup/markup.vcproj
rename to MSVC_Net2005/markup.vcproj
index 818f5d3..614a940
--- a/MSVC_Net2005/examples/markup/markup.vcproj
+++ b/MSVC_Net2005/markup.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="examples_markup"
+       Name="markup"
        ProjectGUID="{6300FCFA-97F1-4967-802E-E354D95DB0EB}"
        Keyword="Win32Proj"
        >
@@ -19,16 +19,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -41,28 +38,24 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/markup.exe"
+                               AdditionalDependencies=""
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -73,9 +66,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/markup.exe"
+                               AdditionalDependencies=""
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -87,10 +79,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -100,7 +90,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -113,23 +102,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/markup.exe"
+                               AdditionalDependencies=""
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -138,7 +124,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -149,9 +134,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/markup.exe"
+                               AdditionalDependencies=""
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -170,8 +154,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\examples\markup\parser.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\markup\parser.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/examples/options/options.vcproj b/MSVC_Net2005/options.vcproj
old mode 100755
new mode 100644
similarity index 53%
rename from MSVC_Net2005/examples/options/options.vcproj
rename to MSVC_Net2005/options.vcproj
index fd3915f..79b27c4
--- a/MSVC_Net2005/examples/options/options.vcproj
+++ b/MSVC_Net2005/options.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="examples_options"
+       Name="options"
        ProjectGUID="{46962B9A-C5E9-4863-9408-97514D63F420}"
-       RootNamespace="examples_dispatcher"
+       RootNamespace="dispatcher"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -20,16 +20,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -42,28 +39,24 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/options.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -74,9 +67,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/options.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -88,10 +80,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -101,7 +91,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -114,23 +103,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/options.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -139,7 +125,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -150,9 +135,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/options.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -171,8 +155,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\examples\options\main.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\options\main.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/gendef/gendef.vcproj b/MSVC_Net2005/properties.vcproj
old mode 100755
new mode 100644
similarity index 67%
copy from MSVC_Net2005/gendef/gendef.vcproj
copy to MSVC_Net2005/properties.vcproj
index 18e4372..c640c1e
--- a/MSVC_Net2005/gendef/gendef.vcproj
+++ b/MSVC_Net2005/properties.vcproj
@@ -2,8 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="gendef"
-       ProjectGUID="{07324745-C9BE-4D65-B08A-9C88188C0C28}"
+       Name="properties"
+       ProjectGUID="{F3CC33A1-C933-4AF2-A05C-4ECE8E41F691}"
+       RootNamespace="dispatcher"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -19,10 +20,8 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -31,7 +30,8 @@
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -39,27 +39,27 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -67,7 +67,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -79,10 +80,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -95,7 +94,8 @@
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -103,21 +103,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -127,7 +126,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -135,7 +135,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -154,8 +155,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\blank.cpp" />
-                       <File RelativePath=".\gendef.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\properties\properties_example.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/examples/regex/regex.vcproj b/MSVC_Net2005/regex.vcproj
similarity index 53%
rename from MSVC_Net2005/examples/regex/regex.vcproj
rename to MSVC_Net2005/regex.vcproj
index 34bb5c3..0eb49e8 100644
--- a/MSVC_Net2005/examples/regex/regex.vcproj
+++ b/MSVC_Net2005/regex.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="examples_regex"
+       Name="regex"
        ProjectGUID="{9C375338-4B27-452F-A3C5-4122D06E6AE3}"
-       RootNamespace="examples_dispatcher"
+       RootNamespace="dispatcher"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -20,16 +20,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -42,28 +39,24 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/regex.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -74,9 +67,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/regex.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -88,10 +80,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -101,7 +91,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -114,23 +103,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/regex.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -139,7 +125,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -150,9 +135,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="glib-2.0.lib sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/regex.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -171,8 +155,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\examples\regex\main.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\regex\main.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/gendef/gendef.vcproj b/MSVC_Net2005/resolver.vcproj
old mode 100755
new mode 100644
similarity index 64%
copy from MSVC_Net2005/gendef/gendef.vcproj
copy to MSVC_Net2005/resolver.vcproj
index 18e4372..6261540
--- a/MSVC_Net2005/gendef/gendef.vcproj
+++ b/MSVC_Net2005/resolver.vcproj
@@ -2,8 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="gendef"
-       ProjectGUID="{07324745-C9BE-4D65-B08A-9C88188C0C28}"
+       Name="resolver"
+       ProjectGUID="{376102F2-3124-4982-9001-E34E521B544D}"
+       RootNamespace="resolver"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -19,19 +20,19 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -39,27 +40,28 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -67,7 +69,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -79,10 +82,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -92,10 +93,12 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -103,21 +106,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -126,8 +128,10 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -135,7 +139,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -154,8 +159,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\blank.cpp" />
-                       <File RelativePath=".\gendef.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\network\resolver.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/gendef/gendef.vcproj b/MSVC_Net2005/socket-client.vcproj
old mode 100755
new mode 100644
similarity index 64%
copy from MSVC_Net2005/gendef/gendef.vcproj
copy to MSVC_Net2005/socket-client.vcproj
index 18e4372..68baf20
--- a/MSVC_Net2005/gendef/gendef.vcproj
+++ b/MSVC_Net2005/socket-client.vcproj
@@ -2,8 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="gendef"
-       ProjectGUID="{07324745-C9BE-4D65-B08A-9C88188C0C28}"
+       Name="socket-client"
+       ProjectGUID="{6E9F9F84-D02D-4E1F-A4D4-85AC26847120}"
+       RootNamespace="socket-client"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -19,19 +20,19 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -39,27 +40,28 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -67,7 +69,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -79,10 +82,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -92,10 +93,12 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -103,21 +106,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -126,8 +128,10 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -135,7 +139,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -154,8 +159,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\blank.cpp" />
-                       <File RelativePath=".\gendef.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\network\socket-client.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/gendef/gendef.vcproj b/MSVC_Net2005/socket-server.vcproj
old mode 100755
new mode 100644
similarity index 64%
rename from MSVC_Net2005/gendef/gendef.vcproj
rename to MSVC_Net2005/socket-server.vcproj
index 18e4372..c696e8a
--- a/MSVC_Net2005/gendef/gendef.vcproj
+++ b/MSVC_Net2005/socket-server.vcproj
@@ -2,8 +2,9 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="gendef"
-       ProjectGUID="{07324745-C9BE-4D65-B08A-9C88188C0C28}"
+       Name="socket-server"
+       ProjectGUID="{9020BBA8-96E3-4587-9107-20BCF3DF5F1F}"
+       RootNamespace="socket-server"
        Keyword="Win32Proj"
        >
        <Platforms>
@@ -19,19 +20,19 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -39,27 +40,28 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -67,7 +69,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -79,10 +82,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -92,10 +93,12 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               RuntimeLibrary="3"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -103,21 +106,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -126,8 +128,10 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               
AdditionalIncludeDirectories="..\gio;.\giomm;$(GlibEtcInstallRoot)\include\gio-win32-2.0"
                                PreprocessorDefinitions=""
-                               RuntimeLibrary="0"
+                               RuntimeLibrary="2"
+                               RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
@@ -135,7 +139,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               OutputFile="$(OutDir)/gendef.exe"
+                               AdditionalDependencies="gio-2.0.lib $(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -154,8 +159,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\blank.cpp" />
-                       <File RelativePath=".\gendef.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\network\socket-server.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/examples/thread/thread.vcproj b/MSVC_Net2005/thread.vcproj
old mode 100755
new mode 100644
similarity index 53%
rename from MSVC_Net2005/examples/thread/thread.vcproj
rename to MSVC_Net2005/thread.vcproj
index 73d36c1..971489a
--- a/MSVC_Net2005/examples/thread/thread.vcproj
+++ b/MSVC_Net2005/thread.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="examples_thread"
+       Name="thread"
        ProjectGUID="{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}"
        Keyword="Win32Proj"
        >
@@ -19,16 +19,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -41,28 +38,24 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/thread.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -73,9 +66,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/thread.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -87,10 +79,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -100,7 +90,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -113,23 +102,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/thread.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -138,7 +124,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -149,9 +134,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/thread.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -170,8 +154,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\examples\thread\thread.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\thread\thread.cc" />
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/MSVC_Net2005/examples/thread_pool/thread_pool.vcproj b/MSVC_Net2005/threadpool.vcproj
old mode 100755
new mode 100644
similarity index 53%
rename from MSVC_Net2005/examples/thread_pool/thread_pool.vcproj
rename to MSVC_Net2005/threadpool.vcproj
index fb2815b..43a394b
--- a/MSVC_Net2005/examples/thread_pool/thread_pool.vcproj
+++ b/MSVC_Net2005/threadpool.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="8.00"
-       Name="examples_thread_pool"
+       Name="threadpool"
        ProjectGUID="{962484DB-2111-48A4-BEF0-194433719D0D}"
        Keyword="Win32Proj"
        >
@@ -19,16 +19,13 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -41,28 +38,24 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/thread_pool.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\win32\include\glib-2.0;..\..\..\..\vs8\win32\lib\glib-2.0\include;..\..\..\..\vs8\win32\include\sigc++-2.0;..\..\..\..\vs8\win32\lib\sigc++-2.0\include;..\..\..\..\vs8\win32\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -73,9 +66,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\win32\lib"
-                               OutputFile="$(OutDir)/thread_pool.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -87,10 +79,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -100,7 +90,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions="_DEBUG"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -113,23 +102,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-d-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/thread_pool.exe"
+                               AdditionalDependencies="$(CPPDepLibsDebug)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="2"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
                                SubSystem="1"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="1"
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       InheritedPropertySheets=".\glibmm-build-defines.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -138,7 +124,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               
AdditionalIncludeDirectories="$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs8\x64\include\glib-2.0;..\..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\..\vs8\x64\include"
                                PreprocessorDefinitions=""
                                RuntimeLibrary="2"
                                RuntimeTypeInfo="true"
@@ -149,9 +134,8 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sigc-vc80-2_0.lib"
-                               AdditionalLibraryDirectories="..\..\..\..\vs8\x64\lib"
-                               OutputFile="$(OutDir)/thread_pool.exe"
+                               AdditionalDependencies="$(CPPDepLibsRelease)"
+                               OutputFile="$(OutDir)\$(ProjectName).exe"
                                LinkIncremental="1"
                                GenerateManifest="true"
                                GenerateDebugInformation="true"
@@ -170,8 +154,8 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\blank.cpp" />
-                       <File RelativePath="..\..\..\examples\thread\threadpool.cc" />
+                       <File RelativePath="blank.cpp" />
+                       <File RelativePath="..\examples\thread\threadpool.cc" />
                </Filter>
                <Filter
                        Name="Header Files"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]