[glibmm] Update MSVC projects for 2.24
- From: Armin Burgmeier <arminb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Update MSVC projects for 2.24
- Date: Fri, 2 Apr 2010 17:38:45 +0000 (UTC)
commit 98a9f0fa7bbcb264ed577c4d938a46fa89c259a2
Author: Armin Burgmeier <armin arbur net>
Date: Fri Apr 2 17:35:36 2010 +0200
Update MSVC projects for 2.24
ChangeLog | 27 +++
MSVC_Net2005/examples/resolver/resolver.vcproj | 213 ++++++++++++++++++++
.../examples/socket-client/socket-client.vcproj | 213 ++++++++++++++++++++
.../examples/socket-server/socket-server.vcproj | 213 ++++++++++++++++++++
MSVC_Net2005/filelist.am | 47 +++--
MSVC_Net2005/giomm/giomm.vcproj | 132 ++++++++++++
MSVC_Net2005/glibmm.sln | 32 +++-
MSVC_Net2005/glibmm/glibmm.vcproj | 12 +-
MSVC_Net2008/examples/resolver/resolver.vcproj | 212 +++++++++++++++++++
.../examples/socket-client/socket-client.vcproj | 212 +++++++++++++++++++
.../examples/socket-server/socket-server.vcproj | 212 +++++++++++++++++++
MSVC_Net2008/filelist.am | 45 +++--
MSVC_Net2008/giomm/giomm.vcproj | 136 +++++++++++++
MSVC_Net2008/glibmm.sln | 30 +++
MSVC_Net2008/glibmm/glibmm.vcproj | 12 +-
examples/network/resolver.cc | 9 +-
examples/network/socket-client.cc | 3 +-
glib/glibmmconfig.h.in | 1 +
tools/extra_defs_gen/generate_defs_gio.cc | 2 +
19 files changed, 1714 insertions(+), 49 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0bff905..dd312fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2010-04-02 Armin Burgmeier <armin arbur net>
+
+ * examples/network/resolver.cc:
+ * examples/network/socket-client.cc: Fix the build with MSVC.
+
+ * glib/glibmmconfig.h.in: Enable GLIBMM_HAVE_WIDE_STREAM with MSVC.
+
+ * tools/extra_defs_gen/generate_defs_gio.cc: Fix the Windows build by
+ ifdefing-out G_TYPE_UNIX_CONNECTION.
+
+ * MSVC_Net2005/giomm/giomm.vcproj:
+ * MSVC_Net2005/glibmm/glibmm.vcproj:
+ * MSVC_Net2008/giomm/giomm.vcproj:
+ * MSVC_Net2008/glibmm/glibmm.vcproj: Added new source and header files
+ to the Visual Studio projects.
+
+ * MSVC_Net2005/examples/resolver/resolver.vcproj:
+ * MSVC_Net2005/examples/socket-client/socket-client.vcproj:
+ * MSVC_Net2005/examples/socket-server/socket-server.vcproj:
+ * MSVC_Net2005/glibmm.sln:
+ * MSVC_Net2005/filelist.am:
+ * MSVC_Net2008/examples/resolver/resolver.vcproj:
+ * MSVC_Net2008/examples/socket-client/socket-client.vcproj:
+ * MSVC_Net2008/examples/socket-server/socket-server.vcproj:
+ * MSVC_Net2008/glibmm.sln:
+ * MSVC_Net2008/filelist.am: Added the new examples to the projects.
+
2.24.0:
Updated configure and NEWS for the stable release.
diff --git a/MSVC_Net2005/examples/resolver/resolver.vcproj b/MSVC_Net2005/examples/resolver/resolver.vcproj
new file mode 100644
index 0000000..d3f0a3f
--- /dev/null
+++ b/MSVC_Net2005/examples/resolver/resolver.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8,00"
+ Name="examples_resolver"
+ ProjectGUID="{376102F2-3124-4982-9001-E34E521B544D}"
+ RootNamespace="examples_resolver"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc80-d-2_0.lib"
+ OutputFile="$(OutDir)/resolver.exe"
+ LinkIncremental="2"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc80-2_0.lib"
+ OutputFile="$(OutDir)/resolver.exe"
+ LinkIncremental="1"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\blank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\examples\network\resolver.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2005/examples/socket-client/socket-client.vcproj b/MSVC_Net2005/examples/socket-client/socket-client.vcproj
new file mode 100644
index 0000000..bfad71e
--- /dev/null
+++ b/MSVC_Net2005/examples/socket-client/socket-client.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8,00"
+ Name="examples_socket-client"
+ ProjectGUID="{6E9F9F84-D02D-4E1F-A4D4-85AC26847120}"
+ RootNamespace="examples_socket-client"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc80-d-2_0.lib"
+ OutputFile="$(OutDir)/socket-client.exe"
+ LinkIncremental="2"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc80-2_0.lib"
+ OutputFile="$(OutDir)/socket-client.exe"
+ LinkIncremental="1"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\blank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\examples\network\socket-client.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2005/examples/socket-server/socket-server.vcproj b/MSVC_Net2005/examples/socket-server/socket-server.vcproj
new file mode 100644
index 0000000..ea4b805
--- /dev/null
+++ b/MSVC_Net2005/examples/socket-server/socket-server.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8,00"
+ Name="examples_socket-server"
+ ProjectGUID="{9020BBA8-96E3-4587-9107-20BCF3DF5F1F}"
+ RootNamespace="examples_socket-server"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc80-d-2_0.lib"
+ OutputFile="$(OutDir)/socket-server.exe"
+ LinkIncremental="2"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc80-2_0.lib"
+ OutputFile="$(OutDir)/socket-server.exe"
+ LinkIncremental="1"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\blank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\examples\network\socket-server.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2005/filelist.am b/MSVC_Net2005/filelist.am
index c1708c3..b59fafa 100644
--- a/MSVC_Net2005/filelist.am
+++ b/MSVC_Net2005/filelist.am
@@ -1,23 +1,28 @@
## This file is part of glibmm.
-msvc_net2005_data = \
- README \
- blank.cpp \
- glibmm.sln \
- gendef/gendef.vcproj \
- gendef/gendef.cc \
- glibmm/glibmm.vcproj \
- glibmm/glibmmconfig.h \
- giomm/giomm.vcproj \
- giomm/giommconfig.h \
- tests/giomm_simple/giomm_simple.vcproj \
- tests/glibmm_value/glibmm_value.vcproj \
- examples/dispatcher/dispatcher.vcproj \
- examples/dispatcher2/dispatcher2.vcproj \
- examples/markup/markup.vcproj \
- examples/options/options.vcproj \
- examples/thread/thread.vcproj \
- examples/thread_pool/thread_pool.vcproj \
- examples/keyfile/keyfile.vcproj \
- examples/properties/properties.vcproj \
- examples/regex/regex.vcproj
+msvc_net2005_data = \
+ README \
+ blank.cpp \
+ glibmm.sln \
+ gendef/gendef.vcproj \
+ gendef/gendef.cc \
+ glibmm/glibmm.vcproj \
+ glibmm/glibmmconfig.h \
+ glibmm/glibmm.rc \
+ giomm/giomm.vcproj \
+ giomm/giommconfig.h \
+ giomm/giomm.rc \
+ tests/giomm_simple/giomm_simple.vcproj \
+ tests/glibmm_value/glibmm_value.vcproj \
+ examples/dispatcher/dispatcher.vcproj \
+ examples/dispatcher2/dispatcher2.vcproj \
+ examples/markup/markup.vcproj \
+ examples/options/options.vcproj \
+ examples/thread/thread.vcproj \
+ examples/thread_pool/thread_pool.vcproj \
+ examples/keyfile/keyfile.vcproj \
+ examples/properties/properties.vcproj \
+ examples/regex/regex.vcproj \
+ examples/resolver/resolver.vcproj \
+ examples/socket-client/socket-client.vcproj \
+ examples/socket-server/socket-server.vcproj
diff --git a/MSVC_Net2005/giomm/giomm.vcproj b/MSVC_Net2005/giomm/giomm.vcproj
index a5726af..69d6e43 100644
--- a/MSVC_Net2005/giomm/giomm.vcproj
+++ b/MSVC_Net2005/giomm/giomm.vcproj
@@ -287,10 +287,22 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\inetaddress.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\inetsocketaddress.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\init.cc"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\initable.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\inputstream.cc"
>
</File>
@@ -319,10 +331,22 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\networkaddress.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\networkservice.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\outputstream.cc"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\resolver.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\seekable.cc"
>
</File>
@@ -331,10 +355,54 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\socket.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketaddress.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketaddressenumerator.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketclient.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketconnectable.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketconnection.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketlistener.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketservice.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\srvtarget.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\tcpconnection.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\themedicon.cc"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\threadedsocketservice.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\volume.cc"
>
</File>
@@ -461,10 +529,22 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\inetaddress.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\inetsocketaddress.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\init.h"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\initable.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\inputstream.h"
>
</File>
@@ -493,10 +573,22 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\networkaddress.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\networkservice.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\outputstream.h"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\resolver.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\seekable.h"
>
</File>
@@ -505,10 +597,50 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\socket.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketaddress.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketaddressenumerator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketclient.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketconnection.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketlistener.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketservice.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\srvtarget.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\tcpconnection.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\themedicon.h"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\threadedsocketservice.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\volume.h"
>
</File>
diff --git a/MSVC_Net2005/glibmm.sln b/MSVC_Net2005/glibmm.sln
index 80372a2..22ca161 100755
--- a/MSVC_Net2005/glibmm.sln
+++ b/MSVC_Net2005/glibmm.sln
@@ -49,8 +49,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giomm-2.4", "giomm\giomm.vc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_giomm_simple", "tests\giomm_simple\giomm_simple.vcproj", "{F4F66980-51D4-4CC2-A529-9AD2C9F7D143}"
ProjectSection(ProjectDependencies) = postProject
- {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
{EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
+ {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_keyfile", "examples\keyfile\keyfile.vcproj", "{FA6C9A26-5192-4C19-9527-64DF5C31E2DA}"
@@ -68,6 +68,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_regex", "examples\
{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_resolver", "examples\resolver\resolver.vcproj", "{376102F2-3124-4982-9001-E34E521B544D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
+ {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_socket-client", "examples\socket-client\socket-client.vcproj", "{6E9F9F84-D02D-4E1F-A4D4-85AC26847120}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
+ {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_socket-server", "examples\socket-server\socket-server.vcproj", "{9020BBA8-96E3-4587-9107-20BCF3DF5F1F}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
+ {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -130,6 +148,18 @@ Global
{9C375338-4B27-452F-A3C5-4122D06E6AE3}.Debug|Win32.Build.0 = Debug|Win32
{9C375338-4B27-452F-A3C5-4122D06E6AE3}.Release|Win32.ActiveCfg = Release|Win32
{9C375338-4B27-452F-A3C5-4122D06E6AE3}.Release|Win32.Build.0 = Release|Win32
+ {376102F2-3124-4982-9001-E34E521B544D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {376102F2-3124-4982-9001-E34E521B544D}.Debug|Win32.Build.0 = Debug|Win32
+ {376102F2-3124-4982-9001-E34E521B544D}.Release|Win32.ActiveCfg = Release|Win32
+ {376102F2-3124-4982-9001-E34E521B544D}.Release|Win32.Build.0 = Release|Win32
+ {6E9F9F84-D02D-4E1F-A4D4-85AC26847120}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6E9F9F84-D02D-4E1F-A4D4-85AC26847120}.Debug|Win32.Build.0 = Debug|Win32
+ {6E9F9F84-D02D-4E1F-A4D4-85AC26847120}.Release|Win32.ActiveCfg = Release|Win32
+ {6E9F9F84-D02D-4E1F-A4D4-85AC26847120}.Release|Win32.Build.0 = Release|Win32
+ {9020BBA8-96E3-4587-9107-20BCF3DF5F1F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9020BBA8-96E3-4587-9107-20BCF3DF5F1F}.Debug|Win32.Build.0 = Debug|Win32
+ {9020BBA8-96E3-4587-9107-20BCF3DF5F1F}.Release|Win32.ActiveCfg = Release|Win32
+ {9020BBA8-96E3-4587-9107-20BCF3DF5F1F}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/MSVC_Net2005/glibmm/glibmm.vcproj b/MSVC_Net2005/glibmm/glibmm.vcproj
index 272f128..3fafb09 100755
--- a/MSVC_Net2005/glibmm/glibmm.vcproj
+++ b/MSVC_Net2005/glibmm/glibmm.vcproj
@@ -187,11 +187,11 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\blank.cpp"
+ RelativePath="..\..\glib\glibmm\balancedtree.cc"
>
</File>
<File
- RelativePath="..\..\glib\glibmm\balancedtree.cc"
+ RelativePath="..\blank.cpp"
>
</File>
<File
@@ -323,6 +323,10 @@
>
</File>
<File
+ RelativePath="..\..\glib\glibmm\sarray.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\glib\glibmm\shell.cc"
>
</File>
@@ -569,6 +573,10 @@
>
</File>
<File
+ RelativePath="..\..\glib\glibmm\sarray.h"
+ >
+ </File>
+ <File
RelativePath="..\..\glib\glibmm\shell.h"
>
</File>
diff --git a/MSVC_Net2008/examples/resolver/resolver.vcproj b/MSVC_Net2008/examples/resolver/resolver.vcproj
new file mode 100644
index 0000000..a603891
--- /dev/null
+++ b/MSVC_Net2008/examples/resolver/resolver.vcproj
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="examples_resolver"
+ ProjectGUID="{E4D320F1-7D2D-43AF-874F-14524220EF92}"
+ RootNamespace="examples_resolver"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc90-d-2_0.lib"
+ OutputFile="$(OutDir)/resolver.exe"
+ LinkIncremental="2"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc90-2_0.lib"
+ OutputFile="$(OutDir)/keyfile.exe"
+ LinkIncremental="1"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\blank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\examples\network\resolver.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2008/examples/socket-client/socket-client.vcproj b/MSVC_Net2008/examples/socket-client/socket-client.vcproj
new file mode 100644
index 0000000..4c5077b
--- /dev/null
+++ b/MSVC_Net2008/examples/socket-client/socket-client.vcproj
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="examples_socket-client"
+ ProjectGUID="{1E38D900-90AC-4E18-B34C-7B08E3383087}"
+ RootNamespace="examples_socket-client"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc90-d-2_0.lib"
+ OutputFile="$(OutDir)/socket-client.exe"
+ LinkIncremental="2"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc90-2_0.lib"
+ OutputFile="$(OutDir)/socket-client.exe"
+ LinkIncremental="1"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\blank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\examples\network\resolver.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2008/examples/socket-server/socket-server.vcproj b/MSVC_Net2008/examples/socket-server/socket-server.vcproj
new file mode 100644
index 0000000..05869b8
--- /dev/null
+++ b/MSVC_Net2008/examples/socket-server/socket-server.vcproj
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9,00"
+ Name="examples_socket-server"
+ ProjectGUID="{7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}"
+ RootNamespace="examples_socket-server"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc90-d-2_0.lib"
+ OutputFile="$(OutDir)/socket-server.exe"
+ LinkIncremental="2"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SolutionDir)\..\glib";"$(SolutionDir)\..\gio";"$(SolutionDir)\glibmm";"$(SolutionDir)\giomm""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ RuntimeTypeInfo="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="glib-2.0.lib gthread-2.0.lib gobject-2.0.lib gio-2.0.lib sigc-vc90-2_0.lib"
+ OutputFile="$(OutDir)/socket-server.exe"
+ LinkIncremental="1"
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\blank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\examples\network\resolver.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC_Net2008/filelist.am b/MSVC_Net2008/filelist.am
index 154bac6..787213e 100644
--- a/MSVC_Net2008/filelist.am
+++ b/MSVC_Net2008/filelist.am
@@ -1,22 +1,27 @@
## This file is part of glibmm.
-msvc_net2008_data = \
- blank.cpp \
- glibmm.sln \
- gendef/gendef.cc \
- gendef/gendef.vcproj \
- glibmm/glibmm.vcproj \
- glibmm/glibmmconfig.h \
- giomm/giomm.vcproj \
- giomm/giommconfig.h \
- tests/giomm_simple/giomm_simple.vcproj \
- tests/glibmm_value/glibmm_value.vcproj \
- examples/dispatcher/dispatcher.vcproj \
- examples/dispatcher2/dispatcher2.vcproj \
- examples/markup/markup.vcproj \
- examples/options/options.vcproj \
- examples/thread/thread.vcproj \
- examples/thread_pool/thread_pool.vcproj \
- examples/keyfile/keyfile.vcproj \
- examples/properties/properties.vcproj \
- examples/regex/regex.vcproj
+msvc_net2008_data = \
+ blank.cpp \
+ glibmm.sln \
+ gendef/gendef.cc \
+ gendef/gendef.vcproj \
+ glibmm/glibmm.vcproj \
+ glibmm/glibmmconfig.h \
+ glibmm/glibmm.rc \
+ giomm/giomm.vcproj \
+ giomm/giommconfig.h \
+ giomm/giomm.rc \
+ tests/giomm_simple/giomm_simple.vcproj \
+ tests/glibmm_value/glibmm_value.vcproj \
+ examples/dispatcher/dispatcher.vcproj \
+ examples/dispatcher2/dispatcher2.vcproj \
+ examples/markup/markup.vcproj \
+ examples/options/options.vcproj \
+ examples/thread/thread.vcproj \
+ examples/thread_pool/thread_pool.vcproj \
+ examples/keyfile/keyfile.vcproj \
+ examples/properties/properties.vcproj \
+ examples/regex/regex.vcproj \
+ examples/resolver/resolver.vcproj \
+ examples/socket-client/socket-client.vcproj \
+ examples/socket-server/socket-server.vcproj
diff --git a/MSVC_Net2008/giomm/giomm.vcproj b/MSVC_Net2008/giomm/giomm.vcproj
index 6a59ef5..33cd63f 100644
--- a/MSVC_Net2008/giomm/giomm.vcproj
+++ b/MSVC_Net2008/giomm/giomm.vcproj
@@ -286,10 +286,22 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\inetaddress.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\inetsocketaddress.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\init.cc"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\initable.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\inputstream.cc"
>
</File>
@@ -318,10 +330,22 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\networkaddress.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\networkservice.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\outputstream.cc"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\resolver.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\seekable.cc"
>
</File>
@@ -330,10 +354,54 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\socket.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketaddress.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketaddressenumerator.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketclient.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketconnectable.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketconnection.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketlistener.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketservice.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\srvtarget.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\tcpconnection.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\themedicon.cc"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\threadedsocketservice.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\volume.cc"
>
</File>
@@ -460,10 +528,22 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\inetaddress.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\inetsocketaddress.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\init.h"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\initable.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\inputstream.h"
>
</File>
@@ -492,10 +572,22 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\networkaddress.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\networkservice.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\outputstream.h"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\resolver.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\seekable.h"
>
</File>
@@ -504,10 +596,54 @@
>
</File>
<File
+ RelativePath="..\..\gio\giomm\socket.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketaddress.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketaddressenumerator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketclient.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketconnectable.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketconnection.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketlistener.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\socketservice.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\srvtarget.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gio\giomm\tcpconnection.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\themedicon.h"
>
</File>
<File
+ RelativePath="..\..\gio\giomm\threadedsocketservice.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gio\giomm\volume.h"
>
</File>
diff --git a/MSVC_Net2008/glibmm.sln b/MSVC_Net2008/glibmm.sln
index cfc52e8..dbc0d83 100644
--- a/MSVC_Net2008/glibmm.sln
+++ b/MSVC_Net2008/glibmm.sln
@@ -68,6 +68,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_regex", "examples\
{58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_resolver", "examples\resolver\resolver.vcproj", "{E4D320F1-7D2D-43AF-874F-14524220EF92}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
+ {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_socket-client", "examples\socket-client\socket-client.vcproj", "{1E38D900-90AC-4E18-B34C-7B08E3383087}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
+ {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_socket-server", "examples\socket-server\socket-server.vcproj", "{7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}"
+ ProjectSection(ProjectDependencies) = postProject
+ {EE6C0430-C2C9-425C-8EBA-963FAC3E9832} = {EE6C0430-C2C9-425C-8EBA-963FAC3E9832}
+ {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -130,6 +148,18 @@ Global
{7374A5A1-4E74-44BD-918C-FDF80B97FA3F}.Debug|Win32.Build.0 = Debug|Win32
{7374A5A1-4E74-44BD-918C-FDF80B97FA3F}.Release|Win32.ActiveCfg = Release|Win32
{7374A5A1-4E74-44BD-918C-FDF80B97FA3F}.Release|Win32.Build.0 = Release|Win32
+ {E4D320F1-7D2D-43AF-874F-14524220EF92}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E4D320F1-7D2D-43AF-874F-14524220EF92}.Debug|Win32.Build.0 = Debug|Win32
+ {E4D320F1-7D2D-43AF-874F-14524220EF92}.Release|Win32.ActiveCfg = Release|Win32
+ {E4D320F1-7D2D-43AF-874F-14524220EF92}.Release|Win32.Build.0 = Release|Win32
+ {1E38D900-90AC-4E18-B34C-7B08E3383087}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1E38D900-90AC-4E18-B34C-7B08E3383087}.Debug|Win32.Build.0 = Debug|Win32
+ {1E38D900-90AC-4E18-B34C-7B08E3383087}.Release|Win32.ActiveCfg = Release|Win32
+ {1E38D900-90AC-4E18-B34C-7B08E3383087}.Release|Win32.Build.0 = Release|Win32
+ {7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}.Debug|Win32.Build.0 = Debug|Win32
+ {7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}.Release|Win32.ActiveCfg = Release|Win32
+ {7A4EB8C4-4784-4E9E-96E6-CA6FF4CE1D20}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/MSVC_Net2008/glibmm/glibmm.vcproj b/MSVC_Net2008/glibmm/glibmm.vcproj
index 4d821c8..add422f 100644
--- a/MSVC_Net2008/glibmm/glibmm.vcproj
+++ b/MSVC_Net2008/glibmm/glibmm.vcproj
@@ -186,11 +186,11 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\blank.cpp"
+ RelativePath="..\..\glib\glibmm\balancedtree.cc"
>
</File>
<File
- RelativePath="..\..\glib\glibmm\balancedtree.cc"
+ RelativePath="..\blank.cpp"
>
</File>
<File
@@ -322,6 +322,10 @@
>
</File>
<File
+ RelativePath="..\..\glib\glibmm\sarray.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\glib\glibmm\shell.cc"
>
</File>
@@ -568,6 +572,10 @@
>
</File>
<File
+ RelativePath="..\..\glib\glibmm\sarray.h"
+ >
+ </File>
+ <File
RelativePath="..\..\glib\glibmm\shell.h"
>
</File>
diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc
index b05200c..14c5984 100644
--- a/examples/network/resolver.cc
+++ b/examples/network/resolver.cc
@@ -19,7 +19,9 @@
* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#ifndef _WIN32
+# include <config.h>
+#endif
#include <giomm.h>
#include <iostream>
@@ -28,7 +30,10 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include <unistd.h>
+
+#ifndef G_OS_WIN32
+# include <unistd.h>
+#endif
#include <gio/gio.h>
diff --git a/examples/network/socket-client.cc b/examples/network/socket-client.cc
index 12a1e95..33428b2 100644
--- a/examples/network/socket-client.cc
+++ b/examples/network/socket-client.cc
@@ -122,7 +122,8 @@ main (int argc,
if (argc != 2)
{
- std::cerr << Glib::ustring::compose ("%1: %2\n", argv[0], "Need to specify hostname");
+ const char* error_message = "Need to specify hostname";
+ std::cerr << Glib::ustring::compose ("%1: %2\n", argv[0], error_message);
return 1;
}
diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in
index 719603f..65b3432 100644
--- a/glib/glibmmconfig.h.in
+++ b/glib/glibmmconfig.h.in
@@ -101,6 +101,7 @@
#ifdef GLIBMM_MSC
# define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1
# define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2
+# define GLIBMM_HAVE_WIDE_STREAM 1
# define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1
# define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1
# define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc
index 6ae378b..920c705 100644
--- a/tools/extra_defs_gen/generate_defs_gio.cc
+++ b/tools/extra_defs_gen/generate_defs_gio.cc
@@ -86,7 +86,9 @@ int main(int, char**)
<< get_defs(G_TYPE_SOCKET_CLIENT)
<< get_defs(G_TYPE_SOCKET_CONNECTION)
<< get_defs(G_TYPE_TCP_CONNECTION)
+#ifndef G_OS_WIN32
<< get_defs(G_TYPE_UNIX_CONNECTION)
+#endif
<< get_defs(G_TYPE_SOCKET_LISTENER)
<< get_defs(G_TYPE_SOCKET_SERVICE)
<< get_defs(G_TYPE_THREADED_SOCKET_SERVICE)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]