[glibmm] Update and Overhaul Visual Studio 2010 Projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Update and Overhaul Visual Studio 2010 Projects
- Date: Sat, 13 Sep 2014 02:41:45 +0000 (UTC)
commit c11abc3cfc6e3e243ac986536039fde5fc08fd12
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Sat Sep 13 10:41:33 2014 +0800
Update and Overhaul Visual Studio 2010 Projects
Give the Visual Studio 2010 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_Net2010/glibmm-build-defines.props:
* MSVC_Net2010/glibmm-version-paths.props: 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_Net2010/glibmm/glibmm.vcxproj:
* MSVC_Net2010/glibmm/glibmm.vcxproj.filters:
* MSVC_Net2010/giomm/giomm.vcxproj:
* MSVC_Net2010/giomm/giomm.vcxproj.filters: Move to MSVC_Net2010/,
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_Net2010/examples/*/*.vcxproj:
* MSVC_Net2010/examples/*/*.vcxproj.filters:
* MSVC_Net2010/tests/*/*.vcxproj
* MSVC_Net2010/tests/*/*.vcxproj.filters: Move all the projects to
MSVC_Net2010/, 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_Net2010/glibmm.sln: Update project names and paths
accordingly.
* MSVC_Net2010/filelist.am: Update file names and paths accordingly
.../thread/thread.vcxproj => compose.vcxproj} | 77 ++--
...def.vcxproj.filters => compose.vcxproj.filters} | 2 +-
.../{gendef/gendef.vcxproj => dispatcher.vcxproj} | 76 ++--
....vcxproj.filters => dispatcher.vcxproj.filters} | 2 +-
.../{examples/dispatcher2 => }/dispatcher2.vcxproj | 66 ++--
...vcxproj.filters => dispatcher2.vcxproj.filters} | 2 +-
MSVC_Net2010/examples/compose/compose.vcxproj | 208 ----------
.../examples/dispatcher/dispatcher.vcxproj | 208 ----------
.../examples/dispatcher/dispatcher.vcxproj.filters | 20 -
MSVC_Net2010/examples/keyfile/keyfile.vcxproj | 208 ----------
.../examples/properties/properties.vcxproj | 208 ----------
.../examples/properties/properties.vcxproj.filters | 20 -
MSVC_Net2010/examples/resolver/resolver.vcxproj | 212 ----------
.../examples/socket-client/socket-client.vcxproj | 212 ----------
.../socket-client/socket-client.vcxproj.filters | 20 -
.../examples/socket-server/socket-server.vcxproj | 212 ----------
.../socket-server/socket-server.vcxproj.filters | 20 -
.../examples/thread/thread.vcxproj.filters | 20 -
.../thread_pool/thread_pool.vcxproj.filters | 20 -
MSVC_Net2010/filelist.am | 86 ++--
MSVC_Net2010/{gendef => }/gendef.vcxproj | 38 +--
MSVC_Net2010/{gendef => }/gendef.vcxproj.filters | 2 +-
MSVC_Net2010/giomm.vcxproj | 436 ++++++++++++++++++++
MSVC_Net2010/giomm.vcxproj.filters | 264 ++++++++++++
MSVC_Net2010/giomm/giomm.vcxproj | 434 -------------------
MSVC_Net2010/giomm/giomm.vcxproj.filters | 258 ------------
.../{tests/giomm_simple => }/giomm_simple.vcxproj | 58 +--
...cxproj.filters => giomm_simple.vcxproj.filters} | 2 +-
MSVC_Net2010/glibmm-build-defines.props | 41 ++
MSVC_Net2010/glibmm-version-paths.props | 42 ++
MSVC_Net2010/glibmm.sln | 36 +-
MSVC_Net2010/glibmm.vcxproj | 351 ++++++++++++++++
MSVC_Net2010/glibmm.vcxproj.filters | 166 ++++++++
MSVC_Net2010/glibmm/glibmm.vcxproj | 363 ----------------
MSVC_Net2010/glibmm/glibmm.vcxproj.filters | 166 --------
.../{tests/glibmm_value => }/glibmm_value.vcxproj | 58 +--
...cxproj.filters => glibmm_value.vcxproj.filters} | 3 +-
.../{gendef/gendef.vcxproj => keyfile.vcxproj} | 76 ++--
.../{examples/keyfile => }/keyfile.vcxproj.filters | 2 +-
MSVC_Net2010/{examples/markup => }/markup.vcxproj | 66 ++--
...ndef.vcxproj.filters => markup.vcxproj.filters} | 2 +-
.../{examples/options => }/options.vcxproj | 68 ++--
.../{examples/options => }/options.vcxproj.filters | 2 +-
.../{gendef/gendef.vcxproj => properties.vcxproj} | 76 ++--
....vcxproj.filters => properties.vcxproj.filters} | 2 +-
MSVC_Net2010/{examples/regex => }/regex.vcxproj | 68 ++--
...endef.vcxproj.filters => regex.vcxproj.filters} | 2 +-
.../{gendef/gendef.vcxproj => resolver.vcxproj} | 80 +++--
...ex.vcxproj.filters => resolver.vcxproj.filters} | 2 +-
.../gendef.vcxproj => socket-client.vcxproj} | 80 +++--
...xproj.filters => socket-client.vcxproj.filters} | 2 +-
.../gendef.vcxproj => socket-server.vcxproj} | 80 +++--
...xproj.filters => socket-server.vcxproj.filters} | 2 +-
.../giomm_simple/giomm_simple.vcxproj.filters | 20 -
.../glibmm_value/glibmm_value.vcxproj.filters | 21 -
.../{gendef/gendef.vcxproj => thread.vcxproj} | 71 ++--
...ndef.vcxproj.filters => thread.vcxproj.filters} | 2 +-
.../thread_pool.vcxproj => threadpool.vcxproj} | 62 ++--
....vcxproj.filters => threadpool.vcxproj.filters} | 2 +-
59 files changed, 1904 insertions(+), 3501 deletions(-)
---
diff --git a/MSVC_Net2010/examples/thread/thread.vcxproj b/MSVC_Net2010/compose.vcxproj
similarity index 66%
rename from MSVC_Net2010/examples/thread/thread.vcxproj
rename to MSVC_Net2010/compose.vcxproj
index 47eb873..1f5eca9 100644
--- a/MSVC_Net2010/examples/thread/thread.vcxproj
+++ b/MSVC_Net2010/compose.vcxproj
@@ -19,89 +19,83 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>examples_thread</ProjectName>
- <ProjectGuid>{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}</ProjectGuid>
+ <ProjectName>compose</ProjectName>
+ <ProjectGuid>{D1C74410-023C-48DE-B636-E8B6D177C306}</ProjectGuid>
+ <RootNamespace>compose</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">thread</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">thread</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">thread</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">thread</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">compose</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compose</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">compose</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">compose</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)thread.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -111,19 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)thread.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -140,23 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)thread.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -169,19 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)thread.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -193,10 +178,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\thread\thread.cc" />
+ <ClCompile Include="..\examples\compose\main.cc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\glibmm\glibmm.vcxproj">
+ <ProjectReference Include="glibmm.vcxproj">
<Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj.filters b/MSVC_Net2010/compose.vcxproj.filters
similarity index 88%
copy from MSVC_Net2010/gendef/gendef.vcxproj.filters
copy to MSVC_Net2010/compose.vcxproj.filters
index a1df3f0..633e276 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj.filters
+++ b/MSVC_Net2010/compose.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\compose\main.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/dispatcher.vcxproj
similarity index 71%
copy from MSVC_Net2010/gendef/gendef.vcxproj
copy to MSVC_Net2010/dispatcher.vcxproj
index 4af7e39..60a8d4d 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj
+++ b/MSVC_Net2010/dispatcher.vcxproj
@@ -19,80 +19,83 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
+ <ProjectName>dispatcher</ProjectName>
+ <ProjectGuid>{129ECC08-6D30-4884-B824-4AF96EF0A45C}</ProjectGuid>
+ <RootNamespace>dispatcher</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dispatcher</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dispatcher</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">dispatcher</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">dispatcher</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -102,15 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -127,19 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -152,15 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +178,13 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc" />
+ <ClCompile Include="..\examples\thread\dispatcher.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="glibmm.vcxproj">
+ <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC_Net2010/examples/regex/regex.vcxproj.filters b/MSVC_Net2010/dispatcher.vcxproj.filters
similarity index 87%
copy from MSVC_Net2010/examples/regex/regex.vcxproj.filters
copy to MSVC_Net2010/dispatcher.vcxproj.filters
index 1cbe7e2..b31869e 100644
--- a/MSVC_Net2010/examples/regex/regex.vcxproj.filters
+++ b/MSVC_Net2010/dispatcher.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\regex\main.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\thread\dispatcher.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj b/MSVC_Net2010/dispatcher2.vcxproj
similarity index 67%
rename from MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj
rename to MSVC_Net2010/dispatcher2.vcxproj
index 04eef36..b280859 100644
--- a/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj
+++ b/MSVC_Net2010/dispatcher2.vcxproj
@@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>examples_dispatcher2</ProjectName>
+ <ProjectName>dispatcher2</ProjectName>
<ProjectGuid>{18A82706-B645-4DF5-AB09-06B90128BAC5}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
@@ -27,54 +27,50 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dispatcher2</TargetName>
@@ -85,23 +81,20 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)dispatcher2.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -111,19 +104,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)dispatcher2.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -140,23 +130,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)dispatcher2.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -169,19 +156,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)dispatcher2.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -193,10 +177,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\thread\dispatcher2.cc" />
+ <ClCompile Include="..\examples\thread\dispatcher2.cc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\glibmm\glibmm.vcxproj">
+ <ProjectReference Include="glibmm.vcxproj">
<Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/MSVC_Net2010/examples/compose/compose.vcxproj.filters b/MSVC_Net2010/dispatcher2.vcxproj.filters
similarity index 91%
rename from MSVC_Net2010/examples/compose/compose.vcxproj.filters
rename to MSVC_Net2010/dispatcher2.vcxproj.filters
index edc1c16..20d0444 100644
--- a/MSVC_Net2010/examples/compose/compose.vcxproj.filters
+++ b/MSVC_Net2010/dispatcher2.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\compose\main.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\thread\dispatcher2.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/filelist.am b/MSVC_Net2010/filelist.am
index ff0688f..56421a0 100644
--- a/MSVC_Net2010/filelist.am
+++ b/MSVC_Net2010/filelist.am
@@ -1,45 +1,45 @@
## This file is part of glibmm.
-msvc_net2010_data = \
- glibmm.sln \
- gendef/gendef.cc \
- gendef/gendef.vcxproj \
- gendef/gendef.vcxproj.filters \
- glibmm/glibmm.vcxproj \
- glibmm/glibmm.vcxproj.filters \
- glibmm/glibmmconfig.h \
- glibmm/glibmm.rc \
- giomm/giomm.vcxproj \
- giomm/giomm.vcxproj.filters \
- giomm/giommconfig.h \
- giomm/giomm.rc \
- tests/giomm_simple/giomm_simple.vcxproj \
- tests/giomm_simple/giomm_simple.vcxproj.filters \
- tests/glibmm_value/glibmm_value.vcxproj \
- tests/glibmm_value/glibmm_value.vcxproj.filters \
- examples/compose/compose.vcxproj \
- examples/compose/compose.vcxproj.filters \
- examples/dispatcher/dispatcher.vcxproj \
- examples/dispatcher/dispatcher.vcxproj.filters \
- examples/dispatcher2/dispatcher2.vcxproj \
- examples/dispatcher2/dispatcher2.vcxproj.filters \
- examples/markup/markup.vcxproj \
- examples/markup/markup.vcxproj.filters \
- examples/options/options.vcxproj \
- examples/options/options.vcxproj.filters \
- examples/thread/thread.vcxproj \
- examples/thread/thread.vcxproj.filters \
- examples/thread_pool/thread_pool.vcxproj \
- examples/thread_pool/thread_pool.vcxproj.filters \
- examples/keyfile/keyfile.vcxproj \
- examples/keyfile/keyfile.vcxproj.filters \
- examples/properties/properties.vcxproj \
- examples/properties/properties.vcxproj.filters \
- examples/regex/regex.vcxproj \
- examples/regex/regex.vcxproj.filters \
- examples/resolver/resolver.vcxproj \
- examples/resolver/resolver.vcxproj.filters \
- examples/socket-client/socket-client.vcxproj \
- examples/socket-client/socket-client.vcxproj.filters \
- examples/socket-server/socket-server.vcxproj \
- examples/socket-server/socket-server.vcxproj.filters
+msvc_net2010_data = \
+ glibmm.sln \
+ gendef/gendef.cc \
+ gendef.vcxproj \
+ gendef.vcxproj.filters \
+ glibmm.vcxproj \
+ glibmm.vcxproj.filters \
+ glibmm/glibmmconfig.h \
+ glibmm/glibmm.rc \
+ giomm.vcxproj \
+ giomm.vcxproj.filters \
+ giomm/giommconfig.h \
+ giomm/giomm.rc \
+ giomm_simple.vcxproj \
+ giomm_simple.vcxproj.filters \
+ glibmm_value.vcxproj \
+ glibmm_value.vcxproj.filters \
+ compose.vcxproj \
+ compose.vcxproj.filters \
+ dispatcher.vcxproj \
+ dispatcher.vcxproj.filters \
+ dispatcher2.vcxproj \
+ dispatcher2.vcxproj.filters \
+ markup.vcxproj \
+ markup.vcxproj.filters \
+ options.vcxproj \
+ options.vcxproj.filters \
+ thread.vcxproj \
+ thread.vcxproj.filters \
+ threadpool.vcxproj \
+ threadpool.vcxproj.filters \
+ keyfile.vcxproj \
+ keyfile.vcxproj.filters \
+ properties.vcxproj \
+ properties.vcxproj.filters \
+ regex.vcxproj \
+ regex.vcxproj.filters \
+ resolver.vcxproj \
+ resolver.vcxproj.filters \
+ socket-client.vcxproj \
+ socket-client.vcxproj.filters \
+ socket-server.vcxproj \
+ socket-server.vcxproj.filters
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/gendef.vcxproj
similarity index 81%
copy from MSVC_Net2010/gendef/gendef.vcxproj
copy to MSVC_Net2010/gendef.vcxproj
index 4af7e39..de5b741 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj
+++ b/MSVC_Net2010/gendef.vcxproj
@@ -26,54 +26,50 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
</PropertyGroup>
@@ -84,15 +80,12 @@
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -104,13 +97,10 @@
<ClCompile>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -131,15 +121,12 @@
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -154,13 +141,10 @@
<ClCompile>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +156,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc" />
+ <ClCompile Include=".\gendef\gendef.cc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj.filters b/MSVC_Net2010/gendef.vcxproj.filters
similarity index 89%
copy from MSVC_Net2010/gendef/gendef.vcxproj.filters
copy to MSVC_Net2010/gendef.vcxproj.filters
index a1df3f0..e81fda2 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj.filters
+++ b/MSVC_Net2010/gendef.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include=".\gendef\gendef.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/giomm.vcxproj b/MSVC_Net2010/giomm.vcxproj
new file mode 100644
index 0000000..67f2191
--- /dev/null
+++ b/MSVC_Net2010/giomm.vcxproj
@@ -0,0 +1,436 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>giomm</ProjectName>
+ <ProjectGuid>{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project=".\glibmm-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project=".\glibmm-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project=".\glibmm-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project=".\glibmm-build-defines.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <PreLinkEvent>
+ <Message>Generate giomm def file</Message>
+ <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll
$(IntDir)*.obj</Command>
+ </PreLinkEvent>
+ <Link>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
+ <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>.;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <PreLinkEvent>
+ <Message>Generate giomm def file</Message>
+ <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll
$(IntDir)*.obj</Command>
+ </PreLinkEvent>
+ <Link>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
+ <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <PreLinkEvent>
+ <Message>Generate giomm def file</Message>
+ <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll
$(IntDir)*.obj</Command>
+ </PreLinkEvent>
+ <Link>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
+ <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(GioMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <PreLinkEvent>
+ <Message>Generate giomm def file</Message>
+ <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll
$(IntDir)*.obj</Command>
+ </PreLinkEvent>
+ <Link>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
+ <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\gio\giomm\action.cc" />
+ <ClCompile Include="..\gio\giomm\actiongroup.cc" />
+ <ClCompile Include="..\gio\giomm\actionmap.cc" />
+ <ClCompile Include="..\gio\giomm\appinfo.cc" />
+ <ClCompile Include="..\gio\giomm\applaunchcontext.cc" />
+ <ClCompile Include="..\gio\giomm\application.cc" />
+ <ClCompile Include="..\gio\giomm\applicationcommandline.cc" />
+ <ClCompile Include="..\gio\giomm\asyncresult.cc" />
+ <ClCompile Include="..\gio\giomm\asyncinitable.cc" />
+ <ClCompile Include="..\gio\giomm\bufferedinputstream.cc" />
+ <ClCompile Include="..\gio\giomm\bufferedoutputstream.cc" />
+ <ClCompile Include="..\gio\giomm\cancellable.cc" />
+ <ClCompile Include="..\gio\giomm\charsetconverter.cc" />
+ <ClCompile Include="..\gio\giomm\contenttype.cc" />
+ <ClCompile Include="..\gio\giomm\converter.cc" />
+ <ClCompile Include="..\gio\giomm\converterinputstream.cc" />
+ <ClCompile Include="..\gio\giomm\converteroutputstream.cc" />
+ <ClCompile Include="..\gio\giomm\credentials.cc" />
+ <ClCompile Include="..\gio\giomm\datainputstream.cc" />
+ <ClCompile Include="..\gio\giomm\dataoutputstream.cc" />
+ <ClCompile Include="..\gio\giomm\dbusactiongroup.cc" />
+ <ClCompile Include="..\gio\giomm\dbusaddress.cc" />
+ <ClCompile Include="..\gio\giomm\dbusauthobserver.cc" />
+ <ClCompile Include="..\gio\giomm\dbusconnection.cc" />
+ <ClCompile Include="..\gio\giomm\dbuserror.cc" />
+ <ClCompile Include="..\gio\giomm\dbuserrorutils.cc" />
+ <ClCompile Include="..\gio\giomm\dbusinterface.cc" />
+ <ClCompile Include="..\gio\giomm\dbusinterfaceskeleton.cc" />
+ <ClCompile Include="..\gio\giomm\dbusinterfacevtable.cc" />
+ <ClCompile Include="..\gio\giomm\dbusintrospection.cc" />
+ <ClCompile Include="..\gio\giomm\dbusmenumodel.cc" />
+ <ClCompile Include="..\gio\giomm\dbusmessage.cc" />
+ <ClCompile Include="..\gio\giomm\dbusmethodinvocation.cc" />
+ <ClCompile Include="..\gio\giomm\dbusobject.cc" />
+ <ClCompile Include="..\gio\giomm\dbusownname.cc" />
+ <ClCompile Include="..\gio\giomm\dbusproxy.cc" />
+ <ClCompile Include="..\gio\giomm\dbusserver.cc" />
+ <ClCompile Include="..\gio\giomm\dbussubtreevtable.cc" />
+ <ClCompile Include="..\gio\giomm\dbusutils.cc" />
+ <ClCompile Include="..\gio\giomm\dbuswatchname.cc" />
+ <ClCompile Include="..\gio\giomm\drive.cc" />
+ <ClCompile Include="..\gio\giomm\emblem.cc" />
+ <ClCompile Include="..\gio\giomm\emblemedicon.cc" />
+ <ClCompile Include="..\gio\giomm\enums.cc" />
+ <ClCompile Include="..\gio\giomm\error.cc" />
+ <ClCompile Include="..\gio\giomm\file.cc" />
+ <ClCompile Include="..\gio\giomm\fileattributeinfo.cc" />
+ <ClCompile Include="..\gio\giomm\fileattributeinfolist.cc" />
+ <ClCompile Include="..\gio\giomm\fileenumerator.cc" />
+ <ClCompile Include="..\gio\giomm\fileicon.cc" />
+ <ClCompile Include="..\gio\giomm\fileinfo.cc" />
+ <ClCompile Include="..\gio\giomm\fileinputstream.cc" />
+ <ClCompile Include="..\gio\giomm\fileiostream.cc" />
+ <ClCompile Include="..\gio\giomm\filemonitor.cc" />
+ <ClCompile Include="..\gio\giomm\filenamecompleter.cc" />
+ <ClCompile Include="..\gio\giomm\fileoutputstream.cc" />
+ <ClCompile Include="..\gio\giomm\filterinputstream.cc" />
+ <ClCompile Include="..\gio\giomm\filteroutputstream.cc" />
+ <ClCompile Include="..\gio\giomm\icon.cc" />
+ <ClCompile Include="..\gio\giomm\inetaddress.cc" />
+ <ClCompile Include="..\gio\giomm\inetsocketaddress.cc" />
+ <ClCompile Include="..\gio\giomm\init.cc" />
+ <ClCompile Include="..\gio\giomm\initable.cc" />
+ <ClCompile Include="..\gio\giomm\inputstream.cc" />
+ <ClCompile Include="..\gio\giomm\iostream.cc" />
+ <ClCompile Include="..\gio\giomm\loadableicon.cc" />
+ <ClCompile Include="..\gio\giomm\memoryinputstream.cc" />
+ <ClCompile Include="..\gio\giomm\memoryoutputstream.cc" />
+ <ClCompile Include="..\gio\giomm\menu.cc" />
+ <ClCompile Include="..\gio\giomm\menuattributeiter.cc" />
+ <ClCompile Include="..\gio\giomm\menuitem.cc" />
+ <ClCompile Include="..\gio\giomm\menulinkiter.cc" />
+ <ClCompile Include="..\gio\giomm\menumodel.cc" />
+ <ClCompile Include="..\gio\giomm\mount.cc" />
+ <ClCompile Include="..\gio\giomm\mountoperation.cc" />
+ <ClCompile Include="..\gio\giomm\networkaddress.cc" />
+ <ClCompile Include="..\gio\giomm\networkservice.cc" />
+ <ClCompile Include="..\gio\giomm\notification.cc" />
+ <ClCompile Include="..\gio\giomm\outputstream.cc" />
+ <ClCompile Include="..\gio\giomm\permission.cc" />
+ <ClCompile Include="..\gio\giomm\pollableinputstream.cc" />
+ <ClCompile Include="..\gio\giomm\pollableoutputstream.cc" />
+ <ClCompile Include="..\gio\giomm\proxy.cc" />
+ <ClCompile Include="..\gio\giomm\proxyaddress.cc" />
+ <ClCompile Include="..\gio\giomm\proxyresolver.cc" />
+ <ClCompile Include="..\gio\giomm\remoteactiongroup.cc" />
+ <ClCompile Include="..\gio\giomm\resolver.cc" />
+ <ClCompile Include="..\gio\giomm\resource.cc" />
+ <ClCompile Include="..\gio\giomm\seekable.cc" />
+ <ClCompile Include="..\gio\giomm\settings.cc" />
+ <ClCompile Include="..\gio\giomm\simpleaction.cc" />
+ <ClCompile Include="..\gio\giomm\simpleactiongroup.cc" />
+ <ClCompile Include="..\gio\giomm\simplepermission.cc" />
+ <ClCompile Include="..\gio\giomm\slot_async.cc" />
+ <ClCompile Include="..\gio\giomm\socket.cc" />
+ <ClCompile Include="..\gio\giomm\socketaddress.cc" />
+ <ClCompile Include="..\gio\giomm\socketaddressenumerator.cc" />
+ <ClCompile Include="..\gio\giomm\socketclient.cc" />
+ <ClCompile Include="..\gio\giomm\socketconnectable.cc" />
+ <ClCompile Include="..\gio\giomm\socketconnection.cc" />
+ <ClCompile Include="..\gio\giomm\socketcontrolmessage.cc" />
+ <ClCompile Include="..\gio\giomm\socketlistener.cc" />
+ <ClCompile Include="..\gio\giomm\socketservice.cc" />
+ <ClCompile Include="..\gio\giomm\socketsource.cc" />
+ <ClCompile Include="..\gio\giomm\srvtarget.cc" />
+ <ClCompile Include="..\gio\giomm\tcpconnection.cc" />
+ <ClCompile Include="..\gio\giomm\themedicon.cc" />
+ <ClCompile Include="..\gio\giomm\threadedsocketservice.cc" />
+ <ClCompile Include="..\gio\giomm\tlscertificate.cc" />
+ <ClCompile Include="..\gio\giomm\tlsclientconnection.cc" />
+ <ClCompile Include="..\gio\giomm\tlsconnection.cc" />
+ <ClCompile Include="..\gio\giomm\tlsdatabase.cc" />
+ <ClCompile Include="..\gio\giomm\tlsinteraction.cc" />
+ <ClCompile Include="..\gio\giomm\tlspassword.cc" />
+ <ClCompile Include="..\gio\giomm\tlsserverconnection.cc" />
+ <ClCompile Include="..\gio\giomm\volume.cc" />
+ <ClCompile Include="..\gio\giomm\volumemonitor.cc" />
+ <ClCompile Include="..\gio\giomm\wrap_init.cc" />
+ <ClCompile Include="..\gio\giomm\zlibcompressor.cc" />
+ <ClCompile Include="..\gio\giomm\zlibdecompressor.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\gio\giomm\action.h" />
+ <ClInclude Include="..\gio\giomm\actiongroup.h" />
+ <ClInclude Include="..\gio\giomm\actionmap.h" />
+ <ClInclude Include="..\gio\giomm\appinfo.h" />
+ <ClInclude Include="..\gio\giomm\applaunchcontext.h" />
+ <ClInclude Include="..\gio\giomm\application.h" />
+ <ClInclude Include="..\gio\giomm\applicationcommandline.h" />
+ <ClInclude Include="..\gio\giomm\asyncinitable.h" />
+ <ClInclude Include="..\gio\giomm\asyncresult.h" />
+ <ClInclude Include="..\gio\giomm\bufferedinputstream.h" />
+ <ClInclude Include="..\gio\giomm\bufferedoutputstream.h" />
+ <ClInclude Include="..\gio\giomm\cancellable.h" />
+ <ClInclude Include="..\gio\giomm\charsetconverter.h" />
+ <ClInclude Include="..\gio\giomm\contenttype.h" />
+ <ClInclude Include="..\gio\giomm\converter.h" />
+ <ClInclude Include="..\gio\giomm\converterinputstream.h" />
+ <ClInclude Include="..\gio\giomm\converteroutputstream.h" />
+ <ClInclude Include="..\gio\giomm\credentials.h" />
+ <ClInclude Include="..\gio\giomm\datainputstream.h" />
+ <ClInclude Include="..\gio\giomm\dataoutputstream.h" />
+ <ClInclude Include="..\gio\giomm\dbusactiongroup.h" />
+ <ClInclude Include="..\gio\giomm\dbusaddress.h" />
+ <ClInclude Include="..\gio\giomm\dbusauthobserver.h" />
+ <ClInclude Include="..\gio\giomm\dbusconnection.h" />
+ <ClInclude Include="..\gio\giomm\dbuserror.h" />
+ <ClInclude Include="..\gio\giomm\dbuserrorutils.h" />
+ <ClInclude Include="..\gio\giomm\dbusinterface.h" />
+ <ClInclude Include="..\gio\giomm\dbusinterfaceskeleton.h" />
+ <ClInclude Include="..\gio\giomm\dbusinterfacevtable.h" />
+ <ClInclude Include="..\gio\giomm\dbusintrospection.h" />
+ <ClInclude Include="..\gio\giomm\dbusmenumodel.h" />
+ <ClInclude Include="..\gio\giomm\dbusmessage.h" />
+ <ClInclude Include="..\gio\giomm\dbusmethodinvocation.h" />
+ <ClInclude Include="..\gio\giomm\dbusobject.h" />
+ <ClInclude Include="..\gio\giomm\dbusownname.h" />
+ <ClInclude Include="..\gio\giomm\dbusproxy.h" />
+ <ClInclude Include="..\gio\giomm\dbusserver.h" />
+ <ClInclude Include="..\gio\giomm\dbussubtreevtable.h" />
+ <ClInclude Include="..\gio\giomm\dbusutils.h" />
+ <ClInclude Include="..\gio\giomm\dbuswatchname.h" />
+ <ClInclude Include="..\gio\giomm\drive.h" />
+ <ClInclude Include="..\gio\giomm\emblem.h" />
+ <ClInclude Include="..\gio\giomm\emblemedicon.h" />
+ <ClInclude Include="..\gio\giomm\enums.h" />
+ <ClInclude Include="..\gio\giomm\error.h" />
+ <ClInclude Include="..\gio\giomm\file.h" />
+ <ClInclude Include="..\gio\giomm\fileattributeinfo.h" />
+ <ClInclude Include="..\gio\giomm\fileattributeinfolist.h" />
+ <ClInclude Include="..\gio\giomm\fileenumerator.h" />
+ <ClInclude Include="..\gio\giomm\fileicon.h" />
+ <ClInclude Include="..\gio\giomm\fileinfo.h" />
+ <ClInclude Include="..\gio\giomm\fileinputstream.h" />
+ <ClInclude Include="..\gio\giomm\fileiostream.h" />
+ <ClInclude Include="..\gio\giomm\filemonitor.h" />
+ <ClInclude Include="..\gio\giomm\filenamecompleter.h" />
+ <ClInclude Include="..\gio\giomm\fileoutputstream.h" />
+ <ClInclude Include="..\gio\giomm\filterinputstream.h" />
+ <ClInclude Include="..\gio\giomm\filteroutputstream.h" />
+ <ClInclude Include="..\gio\giomm\icon.h" />
+ <ClInclude Include="..\gio\giomm\inetaddress.h" />
+ <ClInclude Include="..\gio\giomm\inetsocketaddress.h" />
+ <ClInclude Include="..\gio\giomm\init.h" />
+ <ClInclude Include="..\gio\giomm\initable.h" />
+ <ClInclude Include="..\gio\giomm\inputstream.h" />
+ <ClInclude Include="..\gio\giomm\iostream.h" />
+ <ClInclude Include="..\gio\giomm\loadableicon.h" />
+ <ClInclude Include="..\gio\giomm\memoryinputstream.h" />
+ <ClInclude Include="..\gio\giomm\memoryoutputstream.h" />
+ <ClInclude Include="..\gio\giomm\menu.h" />
+ <ClInclude Include="..\gio\giomm\menuattributeiter.h" />
+ <ClInclude Include="..\gio\giomm\menuitem.h" />
+ <ClInclude Include="..\gio\giomm\menulinkiter.h" />
+ <ClInclude Include="..\gio\giomm\menumodel.h" />
+ <ClInclude Include="..\gio\giomm\mount.h" />
+ <ClInclude Include="..\gio\giomm\mountoperation.h" />
+ <ClInclude Include="..\gio\giomm\networkaddress.h" />
+ <ClInclude Include="..\gio\giomm\networkservice.h" />
+ <ClInclude Include="..\gio\giomm\notification.h" />
+ <ClInclude Include="..\gio\giomm\outputstream.h" />
+ <ClInclude Include="..\gio\giomm\permission.h" />
+ <ClInclude Include="..\gio\giomm\pollableinputstream.h" />
+ <ClInclude Include="..\gio\giomm\pollableoutputstream.h" />
+ <ClInclude Include="..\gio\giomm\proxy.h" />
+ <ClInclude Include="..\gio\giomm\proxyaddress.h" />
+ <ClInclude Include="..\gio\giomm\proxyresolver.h" />
+ <ClInclude Include="..\gio\giomm\remoteactiongroup.h" />
+ <ClInclude Include="..\gio\giomm\resolver.h" />
+ <ClInclude Include="..\gio\giomm\resource.h" />
+ <ClInclude Include="..\gio\giomm\seekable.h" />
+ <ClInclude Include="..\gio\giomm\settings.h" />
+ <ClInclude Include="..\gio\giomm\simpleaction.h" />
+ <ClInclude Include="..\gio\giomm\simpleactiongroup.h" />
+ <ClInclude Include="..\gio\giomm\simplepermission.h" />
+ <ClInclude Include="..\gio\giomm\slot_async.h" />
+ <ClInclude Include="..\gio\giomm\socket.h" />
+ <ClInclude Include="..\gio\giomm\socketaddress.h" />
+ <ClInclude Include="..\gio\giomm\socketaddressenumerator.h" />
+ <ClInclude Include="..\gio\giomm\socketclient.h" />
+ <ClInclude Include="..\gio\giomm\socketconnectable.h" />
+ <ClInclude Include="..\gio\giomm\socketconnection.h" />
+ <ClInclude Include="..\gio\giomm\socketcontrolmessage.h" />
+ <ClInclude Include="..\gio\giomm\socketlistener.h" />
+ <ClInclude Include="..\gio\giomm\socketservice.h" />
+ <ClInclude Include="..\gio\giomm\socketsource.h" />
+ <ClInclude Include="..\gio\giomm\srvtarget.h" />
+ <ClInclude Include="..\gio\giomm\tcpconnection.h" />
+ <ClInclude Include="..\gio\giomm\themedicon.h" />
+ <ClInclude Include="..\gio\giomm\threadedsocketservice.h" />
+ <ClInclude Include="..\gio\giomm\tlscertificate.h" />
+ <ClInclude Include="..\gio\giomm\tlsclientconnection.h" />
+ <ClInclude Include="..\gio\giomm\tlsconnection.h" />
+ <ClInclude Include="..\gio\giomm\tlsdatabase.h" />
+ <ClInclude Include="..\gio\giomm\tlsinteraction.h" />
+ <ClInclude Include="..\gio\giomm\tlspassword.h" />
+ <ClInclude Include="..\gio\giomm\tlsserverconnection.h" />
+ <ClInclude Include="..\gio\giomm\volume.h" />
+ <ClInclude Include="..\gio\giomm\volumemonitor.h" />
+ <ClInclude Include="..\gio\giomm\wrap_init.h" />
+ <ClInclude Include="..\gio\giomm\zlibcompressor.h" />
+ <ClInclude Include="..\gio\giomm\zlibdecompressor.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include=".\giomm\giomm.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="glibmm.vcxproj">
+ <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/giomm.vcxproj.filters b/MSVC_Net2010/giomm.vcxproj.filters
new file mode 100644
index 0000000..f4300a4
--- /dev/null
+++ b/MSVC_Net2010/giomm.vcxproj.filters
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\gio\giomm\action.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\actiongroup.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\actionmap.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\appinfo.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\applaunchcontext.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\application.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\applicationcommandline.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\asyncinitable.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\asyncresult.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\bufferedinputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\bufferedoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\cancellable.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\charsetconverter.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\contenttype.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\converter.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\converterinputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\converteroutputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\credentials.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\datainputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dataoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusactiongroup.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusaddress.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusauthobserver.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusconnection.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbuserror.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbuserrorutils.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusinterface.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusinterfaceskeleton.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusinterfacevtable.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusintrospection.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusmenumodel.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusmessage.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusmethodinvocation.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusobject.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusownname.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusproxy.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusserver.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbussubtreevtable.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbusutils.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\dbuswatchname.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\drive.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\emblem.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\emblemedicon.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\enums.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\error.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\file.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\fileattributeinfo.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\fileattributeinfolist.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\fileenumerator.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\fileicon.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\fileinfo.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\fileinputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\fileiostream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\filemonitor.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\filenamecompleter.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\fileoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\filterinputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\filteroutputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\icon.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\inetaddress.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\inetsocketaddress.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\init.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\initable.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\inputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\iostream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\loadableicon.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\memoryinputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\memoryoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\menu.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\menuattributeiter.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\menuitem.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\menulinkiter.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\menumodel.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\mount.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\mountoperation.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\networkaddress.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\networkservice.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\notification.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\outputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\permission.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\pollableinputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\pollableoutputstream.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\proxy.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\proxyaddress.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\proxyresolver.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\remoteactiongroup.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\resolver.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\resource.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\seekable.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\settings.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\simpleaction.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\simpleactiongroup.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\simplepermission.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\slot_async.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socket.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketaddress.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketaddressenumerator.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketclient.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketconnectable.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketconnection.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketcontrolmessage.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketlistener.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketservice.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\socketsource.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\srvtarget.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\tcpconnection.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\themedicon.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\tlscertificate.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\tlsclientconnection.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\tlsconnection.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\tlsdatabase.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\tlsinteraction.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\tlspassword.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\tlsserverconnection.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\volume.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\volumemonitor.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\wrap_init.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\zlibcompressor.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gio\giomm\zlibdecompressor.cc"><Filter>Source Files</Filter></ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\gio\giomm\action.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\actiongroup.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\actionmap.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\appinfo.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\applaunchcontext.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\application.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\applicationcommandline.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\asyncinitable.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\asyncresult.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\bufferedinputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\bufferedoutputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\cancellable.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\charsetconverter.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\contenttype.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\converter.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\converterinputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\converteroutputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\credentials.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\datainputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dataoutputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusactiongroup.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusaddress.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusauthobserver.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusconnection.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbuserror.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbuserrorutils.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusinterface.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusinterfaceskeleton.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusinterfacevtable.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusintrospection.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusmenumodel.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusmessage.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusmethodinvocation.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusobject.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusownname.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusproxy.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusserver.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbussubtreevtable.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbusutils.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\dbuswatchname.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\drive.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\emblem.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\emblemedicon.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\enums.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\error.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\file.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\fileattributeinfo.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\fileattributeinfolist.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\fileenumerator.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\fileicon.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\fileinfo.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\fileinputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\fileiostream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\filemonitor.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\filenamecompleter.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\fileoutputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\filterinputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\filteroutputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\icon.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\inetaddress.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\inetsocketaddress.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\init.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\initable.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\inputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\iostream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\loadableicon.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\memoryinputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\memoryoutputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\menu.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\menuattributeiter.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\menuitem.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\menulinkiter.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\menumodel.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\mount.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\mountoperation.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\networkaddress.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\networkservice.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\notification.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\outputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\permission.h"><Filter>Source Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\pollableinputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\pollableoutputstream.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\proxy.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\proxyaddress.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\proxyresolver.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\remoteactiongroup.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\resolver.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\resource.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\seekable.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\settings.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\simpleaction.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\simpleactiongroup.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\simplepermission.h"><Filter>Source Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\slot_async.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socket.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketaddress.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketaddressenumerator.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketclient.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketconnectable.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketconnection.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketcontrolmessage.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketlistener.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketservice.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\socketsource.h"><Filter>Source Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\srvtarget.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\tcpconnection.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\themedicon.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\threadedsocketservice.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\tlscertificate.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\tlsclientconnection.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\tlsconnection.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\tlsdatabase.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\tlsinteraction.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\tlspassword.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\tlsserverconnection.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\volume.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\volumemonitor.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\wrap_init.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\zlibcompressor.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gio\giomm\zlibdecompressor.h"><Filter>Header Files</Filter></ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include=".\giomm\giomm.rc"><Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj b/MSVC_Net2010/giomm_simple.vcxproj
similarity index 67%
rename from MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj
rename to MSVC_Net2010/giomm_simple.vcxproj
index c4117c0..692f504 100644
--- a/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj
+++ b/MSVC_Net2010/giomm_simple.vcxproj
@@ -28,54 +28,50 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">giomm_simple</TargetName>
@@ -86,22 +82,19 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)giomm_simple.exe</OutputFile>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -111,18 +104,15 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)giomm_simple.exe</OutputFile>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -139,22 +129,19 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)giomm_simple.exe</OutputFile>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -167,18 +154,15 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)giomm_simple.exe</OutputFile>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -190,14 +174,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\tests\giomm_simple\main.cc" />
+ <ClCompile Include="..\tests\giomm_simple\main.cc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\giomm\giomm.vcxproj">
+ <ProjectReference Include="giomm.vcxproj">
<Project>{ee6c0430-c2c9-425c-8eba-963fac3e9832}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\..\glibmm\glibmm.vcxproj">
+ <ProjectReference Include="glibmm.vcxproj">
<Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj.filters b/MSVC_Net2010/giomm_simple.vcxproj.filters
similarity index 88%
copy from MSVC_Net2010/gendef/gendef.vcxproj.filters
copy to MSVC_Net2010/giomm_simple.vcxproj.filters
index a1df3f0..77ea08c 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj.filters
+++ b/MSVC_Net2010/giomm_simple.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\tests\giomm_simple\main.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/glibmm-build-defines.props b/MSVC_Net2010/glibmm-build-defines.props
new file mode 100644
index 0000000..df94aae
--- /dev/null
+++ b/MSVC_Net2010/glibmm-build-defines.props
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="glibmm-version-paths.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <GLibMMBuildDefs>GLIBMM_BUILD</GLibMMBuildDefs>
+ <GioMMBuildDefs>GIOMM_BUILD</GioMMBuildDefs>
+ <CPPDepLibsRelease>sigc-vc$(VSVer)0-2_0.lib</CPPDepLibsRelease>
+ <CPPDepLibsDebug>sigc-vc$(VSVer)0-d-2_0.lib</CPPDepLibsDebug>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_PropertySheetDisplayName>glibmmbuilddefinesprops</_PropertySheetDisplayName>
+ <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+ <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+
<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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="GLibMMBuildDefs">
+ <Value>$(GLibMMBuildDefs)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GioMMBuildDefs">
+ <Value>$(GioMMBuildDefs)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CPPDepLibsRelease">
+ <Value>$(CPPDepLibsRelease)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CPPDepLibsDebug">
+ <Value>$(CPPDepLibsDebug)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/glibmm-version-paths.props b/MSVC_Net2010/glibmm-version-paths.props
new file mode 100644
index 0000000..d29aa3c
--- /dev/null
+++ b/MSVC_Net2010/glibmm-version-paths.props
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup Label="UserMacros">
+ <VSVer>10</VSVer>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+ <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir>
+ <ApiMajorVersion>2</ApiMajorVersion>
+ <ApiMinorVersion>4</ApiMinorVersion>
+ <ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix>
+ <DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_PropertySheetDisplayName>glibmmversionpathsprops</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemGroup>
+ <BuildMacro Include="VSVer">
+ <Value>$(VSVer)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GlibEtcInstallRoot">
+ <Value>$(GlibEtcInstallRoot)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CopyDir">
+ <Value>$(CopyDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="DefDir">
+ <Value>$(DefDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ApiMajorVersion">
+ <Value>$(ApiMajorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ApiMinorVersion">
+ <Value>$(ApiMinorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ReleaseDllSuffix">
+ <Value>$(ReleaseDllSuffix)</Value>
+ </BuildMacro>
+ <BuildMacro Include="DebugDllSuffix">
+ <Value>$(DebugDllSuffix)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/glibmm.sln b/MSVC_Net2010/glibmm.sln
index 26b629c..aca78eb 100644
--- a/MSVC_Net2010/glibmm.sln
+++ b/MSVC_Net2010/glibmm.sln
@@ -1,40 +1,40 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm-2.4", "glibmm\glibmm.vcxproj",
"{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm", "glibmm.vcxproj",
"{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcxproj",
"{07324745-C9BE-4D65-B08A-9C88188C0C28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef.vcxproj",
"{07324745-C9BE-4D65-B08A-9C88188C0C28}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_markup", "examples\markup\markup.vcxproj",
"{6300FCFA-97F1-4967-802E-E354D95DB0EB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "markup", "markup.vcxproj",
"{6300FCFA-97F1-4967-802E-E354D95DB0EB}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_glibmm_value",
"tests\glibmm_value\glibmm_value.vcxproj", "{22277003-3228-486E-A6A8-994B8B13AF30}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm_value", "glibmm_value.vcxproj",
"{22277003-3228-486E-A6A8-994B8B13AF30}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread", "examples\thread\thread.vcxproj",
"{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thread", "thread.vcxproj",
"{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread_pool",
"examples\thread_pool\thread_pool.vcxproj", "{962484DB-2111-48A4-BEF0-194433719D0D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threadpool", "threadpool.vcxproj",
"{962484DB-2111-48A4-BEF0-194433719D0D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher",
"examples\dispatcher\dispatcher.vcxproj", "{129ECC08-6D30-4884-B824-4AF96EF0A45C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dispatcher", "dispatcher.vcxproj",
"{129ECC08-6D30-4884-B824-4AF96EF0A45C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher2",
"examples\dispatcher2\dispatcher2.vcxproj", "{18A82706-B645-4DF5-AB09-06B90128BAC5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dispatcher2", "dispatcher2.vcxproj",
"{18A82706-B645-4DF5-AB09-06B90128BAC5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_options", "examples\options\options.vcxproj",
"{46962B9A-C5E9-4863-9408-97514D63F420}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "options", "options.vcxproj",
"{46962B9A-C5E9-4863-9408-97514D63F420}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giomm-2.4", "giomm\giomm.vcxproj",
"{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giomm", "giomm.vcxproj",
"{EE6C0430-C2C9-425C-8EBA-963FAC3E9832}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_giomm_simple",
"tests\giomm_simple\giomm_simple.vcxproj", "{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giomm_simple", "giomm_simple.vcxproj",
"{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_keyfile", "examples\keyfile\keyfile.vcxproj",
"{569A24AB-8D81-4427-B40D-85485AA7F3CD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keyfile", "keyfile.vcxproj",
"{569A24AB-8D81-4427-B40D-85485AA7F3CD}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_properties",
"examples\properties\properties.vcxproj", "{206CC821-8BE3-4455-B09E-63F93E30F20C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "properties", "properties.vcxproj",
"{206CC821-8BE3-4455-B09E-63F93E30F20C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_regex", "examples\regex\regex.vcxproj",
"{7374A5A1-4E74-44BD-918C-FDF80B97FA3F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "regex.vcxproj",
"{7374A5A1-4E74-44BD-918C-FDF80B97FA3F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_resolver",
"examples\resolver\resolver.vcxproj", "{E4D320F1-7D2D-43AF-874F-14524220EF92}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resolver", "resolver.vcxproj",
"{E4D320F1-7D2D-43AF-874F-14524220EF92}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_socket-client",
"examples\socket-client\socket-client.vcxproj", "{1E38D900-90AC-4E18-B34C-7B08E3383087}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket-client", "socket-client.vcxproj",
"{1E38D900-90AC-4E18-B34C-7B08E3383087}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_socket-server",
"examples\socket-server\socket-server.vcxproj", "{7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket-server", "socket-server.vcxproj",
"{7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_compose", "examples\compose\compose.vcxproj",
"{D1C74410-023C-48DE-B636-E8B6D177C306}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compose", "compose.vcxproj",
"{D1C74410-023C-48DE-B636-E8B6D177C306}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/MSVC_Net2010/glibmm.vcxproj b/MSVC_Net2010/glibmm.vcxproj
new file mode 100644
index 0000000..56a16d1
--- /dev/null
+++ b/MSVC_Net2010/glibmm.vcxproj
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>glibmm</ProjectName>
+ <ProjectGuid>{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}</ProjectGuid>
+ <RootNamespace>glibmm</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project=".\glibmm-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project=".\glibmm-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project=".\glibmm-build-defines.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project=".\glibmm-build-defines.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <PreLinkEventUseInBuild
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreLinkEventUseInBuild>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+ <PreLinkEventUseInBuild
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreLinkEventUseInBuild>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+ <PreLinkEventUseInBuild
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</PreLinkEventUseInBuild>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+ <PreLinkEventUseInBuild
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreLinkEventUseInBuild>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <PreLinkEvent>
+ <Message>Generate glibmm def file</Message>
+ <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll
$(IntDir)*.obj</Command>
+ </PreLinkEvent>
+ <Link>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
+ <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_DEBUG;$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <PreLinkEvent>
+ <Message>Generate glibmm def file</Message>
+ <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(DebugDllSuffix).dll
$(IntDir)*.obj</Command>
+ </PreLinkEvent>
+ <Link>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <OutputFile>$(OutDir)\$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)$(DebugDllSuffix).lib</ImportLibrary>
+ <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <PreLinkEvent>
+ <Message>Generate glibmm def file</Message>
+ <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll
$(IntDir)*.obj</Command>
+ </PreLinkEvent>
+ <Link>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
+ <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>$(GLibMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <PreLinkEvent>
+ <Message>Generate glibmm def file</Message>
+ <Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(ProjectName)$(ReleaseDllSuffix).dll
$(IntDir)*.obj</Command>
+ </PreLinkEvent>
+ <Link>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <OutputFile>$(OutDir)\$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
+ <ImportLibrary>$(TargetDir)$(ProjectName)$(ReleaseDllSuffix).lib</ImportLibrary>
+ <ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\glib\glibmm\arrayhandle.cc" />
+ <ClCompile Include="..\glib\glibmm\balancedtree.cc" />
+ <ClCompile Include="..\glib\glibmm\base64.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" />
+ <ClCompile Include="..\glib\glibmm\convert.cc" />
+ <ClCompile Include="..\glib\glibmm\date.cc" />
+ <ClCompile Include="..\glib\glibmm\datetime.cc" />
+ <ClCompile Include="..\glib\glibmm\debug.cc" />
+ <ClCompile Include="..\glib\glibmm\dispatcher.cc" />
+ <ClCompile Include="..\glib\glibmm\error.cc" />
+ <ClCompile Include="..\glib\glibmm\exception.cc" />
+ <ClCompile Include="..\glib\glibmm\exceptionhandler.cc" />
+ <ClCompile Include="..\glib\glibmm\fileutils.cc" />
+ <ClCompile Include="..\glib\glibmm\init.cc" />
+ <ClCompile Include="..\glib\glibmm\interface.cc" />
+ <ClCompile Include="..\glib\glibmm\iochannel.cc" />
+ <ClCompile Include="..\glib\glibmm\keyfile.cc" />
+ <ClCompile Include="..\glib\glibmm\main.cc" />
+ <ClCompile Include="..\glib\glibmm\markup.cc" />
+ <ClCompile Include="..\glib\glibmm\miscutils.cc" />
+ <ClCompile Include="..\glib\glibmm\module.cc" />
+ <ClCompile Include="..\glib\glibmm\nodetree.cc" />
+ <ClCompile Include="..\glib\glibmm\object.cc" />
+ <ClCompile Include="..\glib\glibmm\objectbase.cc" />
+ <ClCompile Include="..\glib\glibmm\optioncontext.cc" />
+ <ClCompile Include="..\glib\glibmm\optionentry.cc" />
+ <ClCompile Include="..\glib\glibmm\optiongroup.cc" />
+ <ClCompile Include="..\glib\glibmm\pattern.cc" />
+ <ClCompile Include="..\glib\glibmm\property.cc" />
+ <ClCompile Include="..\glib\glibmm\propertyproxy.cc" />
+ <ClCompile Include="..\glib\glibmm\propertyproxy_base.cc" />
+ <ClCompile Include="..\glib\glibmm\quark.cc" />
+ <ClCompile Include="..\glib\glibmm\random.cc" />
+ <ClCompile Include="..\glib\glibmm\regex.cc" />
+ <ClCompile Include="..\glib\glibmm\sarray.cc" />
+ <ClCompile Include="..\glib\glibmm\shell.cc" />
+ <ClCompile Include="..\glib\glibmm\signalproxy.cc" />
+ <ClCompile Include="..\glib\glibmm\signalproxy_connectionnode.cc" />
+ <ClCompile Include="..\glib\glibmm\spawn.cc" />
+ <ClCompile Include="..\glib\glibmm\streamiochannel.cc" />
+ <ClCompile Include="..\glib\glibmm\stringutils.cc" />
+ <ClCompile Include="..\glib\glibmm\thread.cc" />
+ <ClCompile Include="..\glib\glibmm\threadpool.cc" />
+ <ClCompile Include="..\glib\glibmm\threads.cc" />
+ <ClCompile Include="..\glib\glibmm\timer.cc" />
+ <ClCompile Include="..\glib\glibmm\timeval.cc" />
+ <ClCompile Include="..\glib\glibmm\timezone.cc" />
+ <ClCompile Include="..\glib\glibmm\unicode.cc" />
+ <ClCompile Include="..\glib\glibmm\uriutils.cc" />
+ <ClCompile Include="..\glib\glibmm\ustring.cc" />
+ <ClCompile Include="..\glib\glibmm\utility.cc" />
+ <ClCompile Include="..\glib\glibmm\value.cc" />
+ <ClCompile Include="..\glib\glibmm\value_basictypes.cc" />
+ <ClCompile Include="..\glib\glibmm\value_custom.cc" />
+ <ClCompile Include="..\glib\glibmm\valuearray.cc" />
+ <ClCompile Include="..\glib\glibmm\variant.cc" />
+ <ClCompile Include="..\glib\glibmm\variantdict.cc" />
+ <ClCompile Include="..\glib\glibmm\variantiter.cc" />
+ <ClCompile Include="..\glib\glibmm\varianttype.cc" />
+ <ClCompile Include="..\glib\glibmm\variant_basictypes.cc" />
+ <ClCompile Include="..\glib\glibmm\vectorutils.cc" />
+ <ClCompile Include="..\glib\glibmm\wrap.cc" />
+ <ClCompile Include="..\glib\glibmm\wrap_init.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\glib\glibmm\arrayhandle.h" />
+ <ClInclude Include="..\glib\glibmm\balancedtree.h" />
+ <ClInclude Include="..\glib\glibmm\base64.h" />
+ <ClInclude Include="..\glib\glibmm\bytes.h" />
+ <ClInclude Include="..\glib\glibmm\bytearray.h" />
+ <ClInclude Include="..\glib\glibmm\checksum.h" />
+ <ClInclude Include="..\glib\glibmm\class.h" />
+ <ClInclude Include="..\glib\glibmm\containerhandle_shared.h" />
+ <ClInclude Include="..\glib\glibmm\containers.h" />
+ <ClInclude Include="..\glib\glibmm\convert.h" />
+ <ClInclude Include="..\glib\glibmm\date.h" />
+ <ClInclude Include="..\glib\glibmm\datetime.h" />
+ <ClInclude Include="..\glib\glibmm\debug.h" />
+ <ClInclude Include="..\glib\glibmm\dispatcher.h" />
+ <ClInclude Include="..\glib\glibmm\error.h" />
+ <ClInclude Include="..\glib\glibmm\exception.h" />
+ <ClInclude Include="..\glib\glibmm\exceptionhandler.h" />
+ <ClInclude Include="..\glib\glibmm\fileutils.h" />
+ <ClInclude Include="..\glib\glibmm\helperlist.h" />
+ <ClInclude Include="..\glib\glibmm\i18n-lib.h" />
+ <ClInclude Include="..\glib\glibmm\i18n.h" />
+ <ClInclude Include="..\glib\glibmm\init.h" />
+ <ClInclude Include="..\glib\glibmm\interface.h" />
+ <ClInclude Include="..\glib\glibmm\iochannel.h" />
+ <ClInclude Include="..\glib\glibmm\keyfile.h" />
+ <ClInclude Include="..\glib\glibmm\listhandle.h" />
+ <ClInclude Include="..\glib\glibmm\main.h" />
+ <ClInclude Include="..\glib\glibmm\markup.h" />
+ <ClInclude Include="..\glib\glibmm\miscutils.h" />
+ <ClInclude Include="..\glib\glibmm\module.h" />
+ <ClInclude Include="..\glib\glibmm\nodetree.h" />
+ <ClInclude Include="..\glib\glibmm\object.h" />
+ <ClInclude Include="..\glib\glibmm\objectbase.h" />
+ <ClInclude Include="..\glib\glibmm\optioncontext.h" />
+ <ClInclude Include="..\glib\glibmm\optionentry.h" />
+ <ClInclude Include="..\glib\glibmm\optiongroup.h" />
+ <ClInclude Include="..\glib\glibmm\pattern.h" />
+ <ClInclude Include="..\glib\glibmm\property.h" />
+ <ClInclude Include="..\glib\glibmm\propertyproxy.h" />
+ <ClInclude Include="..\glib\glibmm\propertyproxy_base.h" />
+ <ClInclude Include="..\glib\glibmm\quark.h" />
+ <ClInclude Include="..\glib\glibmm\random.h" />
+ <ClInclude Include="..\glib\glibmm\refptr.h" />
+ <ClInclude Include="..\glib\glibmm\regex.h" />
+ <ClInclude Include="..\glib\glibmm\sarray.h" />
+ <ClInclude Include="..\glib\glibmm\shell.h" />
+ <ClInclude Include="..\glib\glibmm\signalproxy.h" />
+ <ClInclude Include="..\glib\glibmm\signalproxy_connectionnode.h" />
+ <ClInclude Include="..\glib\glibmm\slisthandle.h" />
+ <ClInclude Include="..\glib\glibmm\spawn.h" />
+ <ClInclude Include="..\glib\glibmm\streamiochannel.h" />
+ <ClInclude Include="..\glib\glibmm\stringutils.h" />
+ <ClInclude Include="..\glib\glibmm\thread.h" />
+ <ClInclude Include="..\glib\glibmm\threadpool.h" />
+ <ClInclude Include="..\glib\glibmm\threads.h" />
+ <ClInclude Include="..\glib\glibmm\timer.h" />
+ <ClInclude Include="..\glib\glibmm\timeval.h" />
+ <ClInclude Include="..\glib\glibmm\timezone.h" />
+ <ClInclude Include="..\glib\glibmm\unicode.h" />
+ <ClInclude Include="..\glib\glibmm\uriutils.h" />
+ <ClInclude Include="..\glib\glibmm\ustring.h" />
+ <ClInclude Include="..\glib\glibmm\utility.h" />
+ <ClInclude Include="..\glib\glibmm\value.h" />
+ <ClInclude Include="..\glib\glibmm\value_basictypes.h" />
+ <ClInclude Include="..\glib\glibmm\value_custom.h" />
+ <ClInclude Include="..\glib\glibmm\valuearray.h" />
+ <ClInclude Include="..\glib\glibmm\variant.h" />
+ <ClInclude Include="..\glib\glibmm\variantdict.h" />
+ <ClInclude Include="..\glib\glibmm\variantiter.h" />
+ <ClInclude Include="..\glib\glibmm\varianttype.h" />
+ <ClInclude Include="..\glib\glibmm\variant_basictypes.h" />
+ <ClInclude Include="..\glib\glibmm\vectorutils.h" />
+ <ClInclude Include="..\glib\glibmm\wrap.h" />
+ <ClInclude Include="..\glib\glibmm\wrap_init.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include=".\glibmm\glibmm.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="gendef.vcxproj">
+ <Project>{07324745-c9be-4d65-b08a-9c88188c0c28}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/glibmm.vcxproj.filters b/MSVC_Net2010/glibmm.vcxproj.filters
new file mode 100644
index 0000000..4f4aad3
--- /dev/null
+++ b/MSVC_Net2010/glibmm.vcxproj.filters
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\glib\glibmm\arrayhandle.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\balancedtree.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\base64.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>
+ <ClCompile Include="..\glib\glibmm\class.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\containers.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\convert.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\date.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\datetime.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\debug.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\dispatcher.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\error.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\exception.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\exceptionhandler.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\fileutils.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\init.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\interface.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\iochannel.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\keyfile.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\main.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\markup.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\miscutils.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\module.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\nodetree.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\object.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\objectbase.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\optioncontext.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\optionentry.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\optiongroup.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\pattern.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\property.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\propertyproxy.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\propertyproxy_base.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\quark.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\random.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\regex.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\sarray.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\shell.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\signalproxy.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\signalproxy_connectionnode.cc"><Filter>Source
Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\spawn.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\streamiochannel.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\stringutils.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\thread.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\threadpool.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\threads.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\timer.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\timeval.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\timezone.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\unicode.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\uriutils.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\ustring.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\utility.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\value.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\value_basictypes.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\value_custom.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\valuearray.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\variant.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\variantdict.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\variantiter.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\varianttype.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\variant_basictypes.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\vectorutils.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\wrap.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\glib\glibmm\wrap_init.cc"><Filter>Source Files</Filter></ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\glib\glibmm\arrayhandle.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\balancedtree.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\base64.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>
+ <ClInclude Include="..\glib\glibmm\class.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\containerhandle_shared.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\containers.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\convert.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\date.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\datetime.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\debug.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\dispatcher.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\error.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\exception.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\exceptionhandler.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\fileutils.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\helperlist.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\i18n-lib.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\i18n.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\init.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\interface.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\iochannel.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\keyfile.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\listhandle.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\main.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\markup.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\miscutils.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\module.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\nodetree.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\object.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\objectbase.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\optioncontext.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\optionentry.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\optiongroup.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\pattern.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\property.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\propertyproxy.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\propertyproxy_base.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\quark.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\random.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\refptr.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\regex.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\sarray.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\shell.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\signalproxy.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\signalproxy_connectionnode.h"><Filter>Header
Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\slisthandle.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\spawn.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\streamiochannel.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\stringutils.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\thread.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\threadpool.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\threads.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\timer.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\timeval.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\timezone.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\unicode.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\uriutils.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\ustring.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\utility.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\value.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\value_basictypes.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\value_custom.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\valuearray.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\variant.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\variantdict.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\variantiter.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\varianttype.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\variant_basictypes.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\vectorutils.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\wrap.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\glib\glibmm\wrap_init.h"><Filter>Header Files</Filter></ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include=".\glibmm\glibmm.rc"><Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj b/MSVC_Net2010/glibmm_value.vcxproj
similarity index 69%
rename from MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj
rename to MSVC_Net2010/glibmm_value.vcxproj
index 6f6ca3c..40f1563 100644
--- a/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj
+++ b/MSVC_Net2010/glibmm_value.vcxproj
@@ -28,54 +28,50 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glibmm_value</TargetName>
@@ -86,22 +82,19 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)glibmm_value.exe</OutputFile>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -111,18 +104,15 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)glibmm_value.exe</OutputFile>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -139,22 +129,19 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)glibmm_value.exe</OutputFile>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -167,18 +154,15 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)glibmm_value.exe</OutputFile>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -190,11 +174,11 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\tests\glibmm_value\glibmm_value.cc" />
- <ClCompile Include="..\..\..\tests\glibmm_value\main.cc" />
+ <ClCompile Include="..\tests\glibmm_value\glibmm_value.cc" />
+ <ClCompile Include="..\tests\glibmm_value\main.cc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\glibmm\glibmm.vcxproj">
+ <ProjectReference Include="glibmm.vcxproj">
<Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/MSVC_Net2010/examples/resolver/resolver.vcxproj.filters
b/MSVC_Net2010/glibmm_value.vcxproj.filters
similarity index 83%
rename from MSVC_Net2010/examples/resolver/resolver.vcxproj.filters
rename to MSVC_Net2010/glibmm_value.vcxproj.filters
index 5c85f32..cd2caf9 100644
--- a/MSVC_Net2010/examples/resolver/resolver.vcxproj.filters
+++ b/MSVC_Net2010/glibmm_value.vcxproj.filters
@@ -15,6 +15,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\network\resolver.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\tests\glibmm_value\glibmm_value.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\tests\glibmm_value\main.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/keyfile.vcxproj
similarity index 71%
copy from MSVC_Net2010/gendef/gendef.vcxproj
copy to MSVC_Net2010/keyfile.vcxproj
index 4af7e39..1255f7c 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj
+++ b/MSVC_Net2010/keyfile.vcxproj
@@ -19,80 +19,83 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
+ <ProjectName>keyfile</ProjectName>
+ <ProjectGuid>{569A24AB-8D81-4427-B40D-85485AA7F3CD}</ProjectGuid>
+ <RootNamespace>dispatcher</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">keyfile</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">keyfile</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">keyfile</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">keyfile</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -102,15 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -127,19 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -152,15 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +178,13 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc" />
+ <ClCompile Include="..\examples\keyfile\main.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="glibmm.vcxproj">
+ <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC_Net2010/examples/keyfile/keyfile.vcxproj.filters b/MSVC_Net2010/keyfile.vcxproj.filters
similarity index 87%
rename from MSVC_Net2010/examples/keyfile/keyfile.vcxproj.filters
rename to MSVC_Net2010/keyfile.vcxproj.filters
index f9bcc24..66f4f75 100644
--- a/MSVC_Net2010/examples/keyfile/keyfile.vcxproj.filters
+++ b/MSVC_Net2010/keyfile.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\keyfile\main.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\keyfile\main.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/examples/markup/markup.vcxproj b/MSVC_Net2010/markup.vcxproj
similarity index 66%
rename from MSVC_Net2010/examples/markup/markup.vcxproj
rename to MSVC_Net2010/markup.vcxproj
index 28b4425..274ec36 100644
--- a/MSVC_Net2010/examples/markup/markup.vcxproj
+++ b/MSVC_Net2010/markup.vcxproj
@@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>examples_markup</ProjectName>
+ <ProjectName>markup</ProjectName>
<ProjectGuid>{6300FCFA-97F1-4967-802E-E354D95DB0EB}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
@@ -27,54 +27,50 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">markup</TargetName>
@@ -85,23 +81,20 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)markup.exe</OutputFile>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -111,19 +104,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)markup.exe</OutputFile>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -140,23 +130,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)markup.exe</OutputFile>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -169,19 +156,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)markup.exe</OutputFile>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -193,10 +177,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\markup\parser.cc" />
+ <ClCompile Include="..\examples\markup\parser.cc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\glibmm\glibmm.vcxproj">
+ <ProjectReference Include="glibmm.vcxproj">
<Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj.filters b/MSVC_Net2010/markup.vcxproj.filters
similarity index 88%
copy from MSVC_Net2010/gendef/gendef.vcxproj.filters
copy to MSVC_Net2010/markup.vcxproj.filters
index a1df3f0..02404e7 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj.filters
+++ b/MSVC_Net2010/markup.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\markup\parser.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/examples/options/options.vcxproj b/MSVC_Net2010/options.vcxproj
similarity index 67%
rename from MSVC_Net2010/examples/options/options.vcxproj
rename to MSVC_Net2010/options.vcxproj
index 76dade9..294cfa0 100644
--- a/MSVC_Net2010/examples/options/options.vcxproj
+++ b/MSVC_Net2010/options.vcxproj
@@ -19,63 +19,59 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>examples_options</ProjectName>
+ <ProjectName>options</ProjectName>
<ProjectGuid>{46962B9A-C5E9-4863-9408-97514D63F420}</ProjectGuid>
- <RootNamespace>examples_dispatcher</RootNamespace>
+ <RootNamespace>dispatcher</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">options</TargetName>
@@ -86,23 +82,20 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)options.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -112,19 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)options.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -141,23 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)options.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -170,19 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)options.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -194,10 +178,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\options\main.cc" />
+ <ClCompile Include="..\examples\options\main.cc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\glibmm\glibmm.vcxproj">
+ <ProjectReference Include="glibmm.vcxproj">
<Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/MSVC_Net2010/examples/options/options.vcxproj.filters b/MSVC_Net2010/options.vcxproj.filters
similarity index 87%
rename from MSVC_Net2010/examples/options/options.vcxproj.filters
rename to MSVC_Net2010/options.vcxproj.filters
index f97535c..0b43dc4 100644
--- a/MSVC_Net2010/examples/options/options.vcxproj.filters
+++ b/MSVC_Net2010/options.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\options\main.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\options\main.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/properties.vcxproj
similarity index 71%
copy from MSVC_Net2010/gendef/gendef.vcxproj
copy to MSVC_Net2010/properties.vcxproj
index 4af7e39..a1acc53 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj
+++ b/MSVC_Net2010/properties.vcxproj
@@ -19,80 +19,83 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
+ <ProjectName>properties</ProjectName>
+ <ProjectGuid>{206CC821-8BE3-4455-B09E-63F93E30F20C}</ProjectGuid>
+ <RootNamespace>dispatcher</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">properties</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">properties</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">properties</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">properties</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -102,15 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -127,19 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -152,15 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +178,13 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc" />
+ <ClCompile Include="..\examples\properties\properties_example.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="glibmm.vcxproj">
+ <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj.filters
b/MSVC_Net2010/properties.vcxproj.filters
similarity index 86%
rename from MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj.filters
rename to MSVC_Net2010/properties.vcxproj.filters
index 7f4637f..46b50be 100644
--- a/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj.filters
+++ b/MSVC_Net2010/properties.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\thread\dispatcher2.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\properties\properties_example.cc"><Filter>Source
Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/examples/regex/regex.vcxproj b/MSVC_Net2010/regex.vcxproj
similarity index 66%
rename from MSVC_Net2010/examples/regex/regex.vcxproj
rename to MSVC_Net2010/regex.vcxproj
index 080d6be..27d0c86 100644
--- a/MSVC_Net2010/examples/regex/regex.vcxproj
+++ b/MSVC_Net2010/regex.vcxproj
@@ -19,63 +19,59 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>examples_regex</ProjectName>
+ <ProjectName>regex</ProjectName>
<ProjectGuid>{7374A5A1-4E74-44BD-918C-FDF80B97FA3F}</ProjectGuid>
- <RootNamespace>examples_dispatcher</RootNamespace>
+ <RootNamespace>dispatcher</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">regex</TargetName>
@@ -86,23 +82,20 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
-
<AdditionalDependencies>glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)regex.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -112,19 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
-
<AdditionalDependencies>glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)regex.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -141,23 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
-
<AdditionalDependencies>glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)regex.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -170,19 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
- <PrecompiledHeader>
- </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
-
<AdditionalDependencies>glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)regex.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -194,10 +178,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\regex\main.cc" />
+ <ClCompile Include="..\examples\regex\main.cc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\glibmm\glibmm.vcxproj">
+ <ProjectReference Include="glibmm.vcxproj">
<Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj.filters b/MSVC_Net2010/regex.vcxproj.filters
similarity index 88%
copy from MSVC_Net2010/gendef/gendef.vcxproj.filters
copy to MSVC_Net2010/regex.vcxproj.filters
index a1df3f0..ec39166 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj.filters
+++ b/MSVC_Net2010/regex.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\regex\main.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/resolver.vcxproj
similarity index 68%
copy from MSVC_Net2010/gendef/gendef.vcxproj
copy to MSVC_Net2010/resolver.vcxproj
index 4af7e39..6475393 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj
+++ b/MSVC_Net2010/resolver.vcxproj
@@ -19,80 +19,83 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
+ <ProjectName>resolver</ProjectName>
+ <ProjectGuid>{E4D320F1-7D2D-43AF-874F-14524220EF92}</ProjectGuid>
+ <RootNamespace>resolver</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">resolver</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">resolver</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">resolver</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">resolver</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -102,15 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -127,19 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -152,15 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +178,17 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc" />
+ <ClCompile Include="..\examples\network\resolver.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="giomm.vcxproj">
+ <Project>{ee6c0430-c2c9-425c-8eba-963fac3e9832}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="glibmm.vcxproj">
+ <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC_Net2010/examples/regex/regex.vcxproj.filters b/MSVC_Net2010/resolver.vcxproj.filters
similarity index 91%
copy from MSVC_Net2010/examples/regex/regex.vcxproj.filters
copy to MSVC_Net2010/resolver.vcxproj.filters
index 1cbe7e2..47054fd 100644
--- a/MSVC_Net2010/examples/regex/regex.vcxproj.filters
+++ b/MSVC_Net2010/resolver.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\regex\main.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\network\resolver.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/socket-client.vcxproj
similarity index 67%
copy from MSVC_Net2010/gendef/gendef.vcxproj
copy to MSVC_Net2010/socket-client.vcxproj
index 4af7e39..ad37cc4 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj
+++ b/MSVC_Net2010/socket-client.vcxproj
@@ -19,80 +19,83 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
+ <ProjectName>socket-client</ProjectName>
+ <ProjectGuid>{1E38D900-90AC-4E18-B34C-7B08E3383087}</ProjectGuid>
+ <RootNamespace>socket-client</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">socket-client</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">socket-client</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">socket-client</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">socket-client</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -102,15 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -127,19 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -152,15 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +178,17 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc" />
+ <ClCompile Include="..\examples\network\resolver.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="giomm.vcxproj">
+ <Project>{ee6c0430-c2c9-425c-8eba-963fac3e9832}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="glibmm.vcxproj">
+ <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC_Net2010/examples/markup/markup.vcxproj.filters b/MSVC_Net2010/socket-client.vcxproj.filters
similarity index 87%
copy from MSVC_Net2010/examples/markup/markup.vcxproj.filters
copy to MSVC_Net2010/socket-client.vcxproj.filters
index 0e2ae0b..083a877 100644
--- a/MSVC_Net2010/examples/markup/markup.vcxproj.filters
+++ b/MSVC_Net2010/socket-client.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\markup\parser.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\network\socket-client.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/socket-server.vcxproj
similarity index 67%
copy from MSVC_Net2010/gendef/gendef.vcxproj
copy to MSVC_Net2010/socket-server.vcxproj
index 4af7e39..7a0b085 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj
+++ b/MSVC_Net2010/socket-server.vcxproj
@@ -19,80 +19,83 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
+ <ProjectName>socket-server</ProjectName>
+ <ProjectGuid>{7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}</ProjectGuid>
+ <RootNamespace>socket-server</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">socket-server</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">socket-server</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">socket-server</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">socket-server</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -102,15 +105,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -127,19 +131,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -152,15 +157,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
+
<AdditionalIncludeDirectories>.\giomm;..\gio;$(GlibEtcInstallRoot)\include\gio-win32-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+
<AdditionalDependencies>gio-2.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +178,17 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc" />
+ <ClCompile Include="..\examples\network\resolver.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="giomm.vcxproj">
+ <Project>{ee6c0430-c2c9-425c-8eba-963fac3e9832}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="glibmm.vcxproj">
+ <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC_Net2010/examples/markup/markup.vcxproj.filters b/MSVC_Net2010/socket-server.vcxproj.filters
similarity index 87%
rename from MSVC_Net2010/examples/markup/markup.vcxproj.filters
rename to MSVC_Net2010/socket-server.vcxproj.filters
index 0e2ae0b..ae705a3 100644
--- a/MSVC_Net2010/examples/markup/markup.vcxproj.filters
+++ b/MSVC_Net2010/socket-server.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\markup\parser.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\network\socket-server.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/thread.vcxproj
similarity index 74%
rename from MSVC_Net2010/gendef/gendef.vcxproj
rename to MSVC_Net2010/thread.vcxproj
index 4af7e39..33e2054 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj
+++ b/MSVC_Net2010/thread.vcxproj
@@ -19,80 +19,78 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{07324745-C9BE-4D65-B08A-9C88188C0C28}</ProjectGuid>
+ <ProjectName>thread</ProjectName>
+ <ProjectGuid>{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -102,15 +100,16 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -127,19 +126,20 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -152,15 +152,16 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <OutputFile>$(OutDir)gendef.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +173,13 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc" />
+ <ClCompile Include="..\examples\thread\thread.cc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="glibmm.vcxproj">
+ <Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/MSVC_Net2010/gendef/gendef.vcxproj.filters b/MSVC_Net2010/thread.vcxproj.filters
similarity index 88%
rename from MSVC_Net2010/gendef/gendef.vcxproj.filters
rename to MSVC_Net2010/thread.vcxproj.filters
index a1df3f0..a5ab635 100644
--- a/MSVC_Net2010/gendef/gendef.vcxproj.filters
+++ b/MSVC_Net2010/thread.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="gendef.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\thread\thread.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj b/MSVC_Net2010/threadpool.vcxproj
similarity index 66%
rename from MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj
rename to MSVC_Net2010/threadpool.vcxproj
index cd18292..3e04778 100644
--- a/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj
+++ b/MSVC_Net2010/threadpool.vcxproj
@@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>examples_thread_pool</ProjectName>
+ <ProjectName>threadpool</ProjectName>
<ProjectGuid>{962484DB-2111-48A4-BEF0-194433719D0D}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
@@ -27,65 +27,57 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v100</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project=".\glibmm-build-defines.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
- <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">thread_pool</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">thread_pool</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">thread_pool</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">thread_pool</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,11 +89,10 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)thread_pool.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -111,7 +102,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -121,9 +112,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)thread_pool.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -140,7 +130,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,11 +142,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-d-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)thread_pool.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+ <ProgramDatabaseFile>$(OutDir)\$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -169,7 +158,7 @@
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
-
<AdditionalIncludeDirectories>$(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -179,9 +168,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>sigc-vc100-2_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <OutputFile>$(OutDir)thread_pool.exe</OutputFile>
+ <AdditionalDependencies>$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -193,10 +181,10 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\thread\threadpool.cc" />
+ <ClCompile Include="..\examples\thread\threadpool.cc" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\glibmm\glibmm.vcxproj">
+ <ProjectReference Include="glibmm.vcxproj">
<Project>{58b2b53c-c4ff-47fd-817b-095e45b7f7d4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
diff --git a/MSVC_Net2010/examples/regex/regex.vcxproj.filters b/MSVC_Net2010/threadpool.vcxproj.filters
similarity index 87%
rename from MSVC_Net2010/examples/regex/regex.vcxproj.filters
rename to MSVC_Net2010/threadpool.vcxproj.filters
index 1cbe7e2..d0e255d 100644
--- a/MSVC_Net2010/examples/regex/regex.vcxproj.filters
+++ b/MSVC_Net2010/threadpool.vcxproj.filters
@@ -15,6 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\examples\regex\main.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\examples\thread\threadpool.cc"><Filter>Source Files</Filter></ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
