Visual Studio Projects: Fix and update.

	* Fix Visual C++ projects for glibmm and giomm as numerous
	sources have been added for the addition of APIs so that
	these libraries can be properly built

	* Also make the project files work better with the GLib Visual C++
	builds (which are currently supported in the GLib source
	distribution), so that the files from the GLib build can be picked
	up by the glibmm projects when the Glib sources and glibmm sources
	are extracted in the same root folder (for example,
	c:\foo\glib-2.35.9 and c:\foo\glibmm-2.35.9).  This is useful
	especially when we want to build glibmm unstable, which most
	probably needs the latest GLib unstable.

	* Fix the resolver project files for Visual C++ 2008/2010 for having
	the wrong executable output name

2 files changed, 24 insertions, 5 deletions

diff --git a/MSVC_Net2010/glibmm/glibmm.vcxproj b/MSVC_Net2010/glibmm/glibmm.vcxproj
index 1f8e6e14..b3b1f944 100644
--- a/MSVC_Net2010/glibmm/glibmm.vcxproj
+++ b/MSVC_Net2010/glibmm/glibmm.vcxproj
@@ -62,7 +62,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreLinkEventUseInBuild>
@@ -88,7 +87,7 @@
     <ClCompile>
       <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../..;../../glib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../..;../../glib;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -105,6 +104,7 @@
     </PreLinkEvent>
     <Link>
       <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)glibmm-vc100-d-2_4.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -120,7 +120,7 @@
     <ClCompile>
       <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../..;../../glib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../..;../../glib;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -137,6 +137,7 @@
     </PreLinkEvent>
     <Link>
       <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)glibmm-vc100-d-2_4.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -149,7 +150,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../..;../../glib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../..;../../glib;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -164,6 +165,7 @@
     </PreLinkEvent>
     <Link>
       <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)glibmm-vc100-2_4.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -177,7 +179,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../..;../../glib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../..;../../glib;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -192,6 +194,7 @@
     </PreLinkEvent>
     <Link>
       <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <OutputFile>$(OutDir)glibmm-vc100-2_4.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -202,6 +205,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\glib\glibmm\balancedtree.cc" />
+    <ClCompile Include="..\..\glib\glibmm\bytes.cc" />
+    <ClCompile Include="..\..\glib\glibmm\bytearray.cc" />
     <ClCompile Include="..\..\glib\glibmm\checksum.cc" />
     <ClCompile Include="..\..\glib\glibmm\class.cc" />
     <ClCompile Include="..\..\glib\glibmm\containers.cc" />
@@ -263,6 +268,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\glib\glibmm\arrayhandle.h" />
+    <ClInclude Include="..\..\glib\glibmm\bytes.h" />
+    <ClInclude Include="..\..\glib\glibmm\bytearray.h" />
     <ClInclude Include="..\..\glib\glibmm\balancedtree.h" />
     <ClInclude Include="..\..\glib\glibmm\checksum.h" />
     <ClInclude Include="..\..\glib\glibmm\class.h" />
diff --git a/MSVC_Net2010/glibmm/glibmm.vcxproj.filters b/MSVC_Net2010/glibmm/glibmm.vcxproj.filters
index 4b44f631..3993f37a 100644
--- a/MSVC_Net2010/glibmm/glibmm.vcxproj.filters
+++ b/MSVC_Net2010/glibmm/glibmm.vcxproj.filters
@@ -18,6 +18,12 @@
     <ClCompile Include="..\..\glib\glibmm\balancedtree.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\glib\glibmm\bytes.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\glib\glibmm\bytearray.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\glib\glibmm\checksum.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -200,6 +206,12 @@
     <ClInclude Include="..\..\glib\glibmm\balancedtree.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\glib\glibmm\bytes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\glib\glibmm\bytearray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\glib\glibmm\checksum.h">
       <Filter>Header Files</Filter>
     </ClInclude>