From 9bdc08c9f031c549339cd9d8a42bbfbdcd83d713 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Wed, 27 Jun 2012 02:34:23 +0000 Subject: [PATCH] - added POCO_ENABLE_CPP11 config define (default for VS >= 2010) - added _WIN32_WINNT value detection up to Windows 7 - modified Util::Units to compile with VS 2010 (static_assert is standard in C++11) --- Foundation/include/Poco/Config.h | 2 + Foundation/include/Poco/Platform_WIN32.h | 41 +- Util/Util_vs100.vcxproj | 251 ++++----- Util/Util_vs100.vcxproj.filters | 3 + Util/include/Poco/Util/Units.h | 6 + Util/samples/Units/Units.progen | 9 + Util/samples/Units/Units_CE_vs90.vcproj | 468 +++++++++++++++++ Util/samples/Units/Units_vs100.vcxproj | 299 +++++++++++ .../samples/Units/Units_vs100.vcxproj.filters | 16 + Util/samples/Units/Units_vs71.vcproj | 226 ++++++-- Util/samples/Units/Units_vs80.vcproj | 481 ++++++++++-------- Util/samples/Units/Units_vs90.vcproj | 466 +++++++++-------- Util/samples/Units/Units_x64_vs100.vcxproj | 299 +++++++++++ .../Units/Units_x64_vs100.vcxproj.filters | 16 + Util/samples/Units/Units_x64_vs90.vcproj | 435 ++++++++++++++++ Util/samples/Units/src/Units.cpp | 66 +-- Util/samples/samples.progen | 3 +- Util/samples/samples_CE_vs90.sln | 20 + Util/samples/samples_vs100.sln | 20 + Util/samples/samples_vs71.sln | 16 + Util/samples/samples_vs80.sln | 20 + Util/samples/samples_vs90.sln | 20 + Util/samples/samples_x64_vs100.sln | 20 + Util/samples/samples_x64_vs90.sln | 20 + 24 files changed, 2593 insertions(+), 630 deletions(-) create mode 100644 Util/samples/Units/Units.progen create mode 100644 Util/samples/Units/Units_CE_vs90.vcproj create mode 100644 Util/samples/Units/Units_vs100.vcxproj create mode 100644 Util/samples/Units/Units_vs100.vcxproj.filters create mode 100644 Util/samples/Units/Units_x64_vs100.vcxproj create mode 100644 Util/samples/Units/Units_x64_vs100.vcxproj.filters create mode 100644 Util/samples/Units/Units_x64_vs90.vcproj diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h index c4c5b831b..3c521308f 100644 --- a/Foundation/include/Poco/Config.h +++ b/Foundation/include/Poco/Config.h @@ -43,6 +43,8 @@ // Define to enable Windows Unicode (UTF-8) support #define POCO_WIN32_UTF8 +// Define to enable C++11 support +//#define POCO_ENABLE_CPP11 // Define to disable implicit linking // #define POCO_NO_AUTOMATIC_LIBS diff --git a/Foundation/include/Poco/Platform_WIN32.h b/Foundation/include/Poco/Platform_WIN32.h index 58c9a7a41..826170386 100644 --- a/Foundation/include/Poco/Platform_WIN32.h +++ b/Foundation/include/Poco/Platform_WIN32.h @@ -56,15 +56,44 @@ // Reduce bloat imported by "Poco/UnWindows.h" #if defined(_WIN32) - #if !defined(_WIN32_WINNT) - #define _WIN32_WINNT 0x0501 - #endif +// #if !defined(_WIN32_WINNT) +// #define _WIN32_WINNT 0x0501 +// #endif #if !defined(WIN32_LEAN_AND_MEAN) && !defined(POCO_BLOATED_WIN32) #define WIN32_LEAN_AND_MEAN #endif #endif +#include "Poco/UnWindows.h" + + +#if !defined(_WIN32_WINNT) + #if defined(_WIN32_WINNT_WIN7) + //Windows 7 _WIN32_WINNT_WIN7 (0x0601) + #define _WIN32_WINNT _WIN32_WINNT_WIN7 + #elif defined (_WIN32_WINNT_WS08) + //Windows Server 2008 _WIN32_WINNT_WS08 (0x0600) + #define _WIN32_WINNT _WIN32_WINNT_WS08 + #elif defined (_WIN32_WINNT_VISTA) || defined (_WIN32_WINNT_LONGHORN) + //Windows Vista _WIN32_WINNT_VISTA (0x0600) + #define _WIN32_WINNT _WIN32_WINNT_VISTA + #elif defined (_WIN32_WINNT_WS03) + //Windows Server 2003 with SP1, + //Windows XP with SP2 _WIN32_WINNT_WS03 (0x0502) + #define _WIN32_WINNT _WIN32_WINNT_WS03 + #elif defined (_WIN32_WINNT_WINXP) + //Windows Server 2003, Windows XP _WIN32_WINNT_WINXP (0x0501) + #define _WIN32_WINNT _WIN32_WINNT_WINXP + #elif defined (_WIN32_WINNT_WIN2K) + //Windows 2000 _WIN32_WINNT_WIN2K (0x0500) + #define _WIN32_WINNT _WIN32_WINNT_WIN2K + #else + #define _WIN32_WINNT 0x0500 + #endif +#endif + + // Unicode Support #if defined(UNICODE) && !defined(POCO_WIN32_UTF8) #define POCO_WIN32_UTF8 @@ -83,6 +112,12 @@ #endif +// Enable C++11 support for VS 2010 and newer +#if defined(_MSC_VER) && (_MSC_VER >= 1600) && !defined(POCO_ENABLE_CPP11) + #define POCO_ENABLE_CPP11 +#endif + + #if defined(__INTEL_COMPILER) #pragma warning(disable:1738) // base class dllexport/dllimport specification differs from that of the derived class #pragma warning(disable:1478) // function ... was declared "deprecated" diff --git a/Util/Util_vs100.vcxproj b/Util/Util_vs100.vcxproj index ea46ec56a..2987c434c 100644 --- a/Util/Util_vs100.vcxproj +++ b/Util/Util_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,76 +32,76 @@ Util Win32Proj - - + + StaticLibrary MultiByte - + StaticLibrary MultiByte - + StaticLibrary MultiByte - + StaticLibrary MultiByte - + DynamicLibrary MultiByte - + DynamicLibrary MultiByte - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_ProjectFileVersion>10.0.40219.1 - ..\bin\ - obj\$(Configuration)\ - true - ..\bin\ - obj\$(Configuration)\ - false - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - ..\lib\ - obj\$(Configuration)\ - PocoUtild - PocoUtilmdd - PocoUtilmtd - PocoUtil - PocoUtilmd - PocoUtilmt + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoUtild + PocoUtilmdd + PocoUtilmtd + PocoUtil + PocoUtilmd + PocoUtilmt - + Disabled .\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories) @@ -114,7 +114,7 @@ true true true - + Level3 EditAndContinue Default @@ -132,7 +132,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -147,9 +147,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -166,7 +166,7 @@ MachineX86 - + Disabled .\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories) @@ -179,7 +179,7 @@ true true true - + ..\lib\PocoUtilmtd.pdb Level3 EditAndContinue @@ -190,7 +190,7 @@ ..\lib\PocoUtilmtd.lib - + Disabled OnlyExplicitInline @@ -205,9 +205,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -215,7 +215,7 @@ ..\lib\PocoUtilmt.lib - + Disabled .\include;..\Foundation\include;..\XML\include;%(AdditionalIncludeDirectories) @@ -228,7 +228,7 @@ true true true - + ..\lib\PocoUtilmdd.pdb Level3 EditAndContinue @@ -239,7 +239,7 @@ ..\lib\PocoUtilmdd.lib - + Disabled OnlyExplicitInline @@ -254,10 +254,10 @@ true true true - + ..\lib\PocoUtilmd.pdb Level3 - + Default %(DisableSpecificWarnings) @@ -267,77 +267,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - true - true - true - true + true + true + true + true - - - + + + \ No newline at end of file diff --git a/Util/Util_vs100.vcxproj.filters b/Util/Util_vs100.vcxproj.filters index a07364362..a8ac4668b 100644 --- a/Util/Util_vs100.vcxproj.filters +++ b/Util/Util_vs100.vcxproj.filters @@ -150,6 +150,9 @@ Timer\Header Files + + Util\Header Files + diff --git a/Util/include/Poco/Util/Units.h b/Util/include/Poco/Util/Units.h index f0e0d51dc..92a37bf1f 100644 --- a/Util/include/Poco/Util/Units.h +++ b/Util/include/Poco/Util/Units.h @@ -328,9 +328,11 @@ Value > raise(const Value& a) namespace Internal { +#ifndef POCO_ENABLE_CPP11 template struct static_assert; template <> struct static_assert { }; /// Ensures (at compile-time) that the template argument is true. +#endif template struct Convertible; @@ -374,7 +376,11 @@ namespace Internal /// specialize this template. /// The default implementation falls through to Convert2. { +#ifdef POCO_ENABLE_CPP11 + static_assert(Convertible::Value, "Error: Value not convertible."); +#else static_assert::Value> checkConvertible; +#endif /// If this fails, then T1 is not Convertible to T2: template diff --git a/Util/samples/Units/Units.progen b/Util/samples/Units/Units.progen new file mode 100644 index 000000000..1c2313390 --- /dev/null +++ b/Util/samples/Units/Units.progen @@ -0,0 +1,9 @@ +vc.project.guid = ${vc.project.guidFromName} +vc.project.name = ${vc.project.baseName} +vc.project.target = ${vc.project.name} +vc.project.type = executable +vc.project.pocobase = ..\\..\\.. +vc.project.platforms = Win32, x64, WinCE +vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md +vc.project.prototype = ${vc.project.name}_vs90.vcproj +vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Util\\include diff --git a/Util/samples/Units/Units_CE_vs90.vcproj b/Util/samples/Units/Units_CE_vs90.vcproj new file mode 100644 index 000000000..341f7d4cc --- /dev/null +++ b/Util/samples/Units/Units_CE_vs90.vcproj @@ -0,0 +1,468 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/Units/Units_vs100.vcxproj b/Util/samples/Units/Units_vs100.vcxproj new file mode 100644 index 000000000..45e302d49 --- /dev/null +++ b/Util/samples/Units/Units_vs100.vcxproj @@ -0,0 +1,299 @@ + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Units + {A6800637-61D5-39A3-86AA-E180C73D3120} + Units + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin\ + obj\$(Configuration)\ + true + bin\ + obj\$(Configuration)\ + false + bin\static_mt\ + obj\$(Configuration)\ + true + bin\static_mt\ + obj\$(Configuration)\ + false + bin\static_md\ + obj\$(Configuration)\ + true + bin\static_md\ + obj\$(Configuration)\ + false + Unitsd + Unitsd + Unitsd + Units + Units + Units + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_mt\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_mt\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Unitsd.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + true + true + bin\static_md\Unitsd.pdb + Console + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin\static_md\Units.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX86 + + + + + + + + diff --git a/Util/samples/Units/Units_vs100.vcxproj.filters b/Util/samples/Units/Units_vs100.vcxproj.filters new file mode 100644 index 000000000..5b525fe33 --- /dev/null +++ b/Util/samples/Units/Units_vs100.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {84fd7f9b-40f2-4e3f-ad6b-069968997168} + + + {020a442f-c607-43ea-935a-4cba49478ca1} + + + + + Source Files + + + \ No newline at end of file diff --git a/Util/samples/Units/Units_vs71.vcproj b/Util/samples/Units/Units_vs71.vcproj index 57eb3e99d..a4b1f6b03 100644 --- a/Util/samples/Units/Units_vs71.vcproj +++ b/Util/samples/Units/Units_vs71.vcproj @@ -1,9 +1,10 @@ + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="4" + DisableSpecificWarnings="4800;"/> + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="0" + DisableSpecificWarnings="4800;"/> + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="4" + DisableSpecificWarnings="4800;"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Detect64BitPortabilityProblems="FALSE" + DebugInformationFormat="0" + DisableSpecificWarnings="4800;"/> - - + - + Name="Header Files"/> + Name="Source Files"> - + RelativePath=".\src\Units.cpp"/> - - + diff --git a/Util/samples/Units/Units_vs80.vcproj b/Util/samples/Units/Units_vs80.vcproj index 3e7a9252c..368f290eb 100644 --- a/Util/samples/Units/Units_vs80.vcproj +++ b/Util/samples/Units/Units_vs80.vcproj @@ -1,48 +1,39 @@ + Version="8.00" + ProjectType="Visual C++" + ProjectGUID="{A6800637-61D5-39A3-86AA-E180C73D3120}" + RootNamespace="Units" + Keyword="Win32Proj"> + Name="Win32"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> - + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" + CompileAs="0" + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> - + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAs="0" + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> - + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" + CompileAs="0" + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> - + Name="VCPostBuildEventTool"/> - - + - + Name="Header Files"/> + Name="Source Files"> - + RelativePath=".\src\Units.cpp"/> - - + diff --git a/Util/samples/Units/Units_vs90.vcproj b/Util/samples/Units/Units_vs90.vcproj index ef5b72aeb..aedbf49de 100644 --- a/Util/samples/Units/Units_vs90.vcproj +++ b/Util/samples/Units/Units_vs90.vcproj @@ -1,48 +1,39 @@ + Version="9.00" + ProjectType="Visual C++" + ProjectGUID="{A6800637-61D5-39A3-86AA-E180C73D3120}" + RootNamespace="Units" + Keyword="Win32Proj"> + Name="Win32"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + CompileAs="0" + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" + CompileAs="0" + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CompileAs="0" + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" + CompileAs="0" + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> - - + - + Name="Header Files"/> + Name="Source Files"> - + RelativePath=".\src\Units.cpp"/> - - + diff --git a/Util/samples/Units/Units_x64_vs100.vcxproj b/Util/samples/Units/Units_x64_vs100.vcxproj new file mode 100644 index 000000000..d3e373216 --- /dev/null +++ b/Util/samples/Units/Units_x64_vs100.vcxproj @@ -0,0 +1,299 @@ + + + + + debug_shared + x64 + + + debug_static_md + x64 + + + debug_static_mt + x64 + + + release_shared + x64 + + + release_static_md + x64 + + + release_static_mt + x64 + + + + Units + {A6800637-61D5-39A3-86AA-E180C73D3120} + Units + Win32Proj + + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin64\ + obj64\$(Configuration)\ + true + bin64\ + obj64\$(Configuration)\ + false + bin64\static_mt\ + obj64\$(Configuration)\ + true + bin64\static_mt\ + obj64\$(Configuration)\ + false + bin64\static_md\ + obj64\$(Configuration)\ + true + bin64\static_md\ + obj64\$(Configuration)\ + false + Unitsd + Unitsd + Unitsd + Units + Units + Units + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + bin64\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_mt\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_mt\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Unitsd.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + true + true + bin64\static_md\Unitsd.pdb + Console + MachineX64 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + bin64\static_md\Units.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineX64 + + + + + + + + diff --git a/Util/samples/Units/Units_x64_vs100.vcxproj.filters b/Util/samples/Units/Units_x64_vs100.vcxproj.filters new file mode 100644 index 000000000..c0442210a --- /dev/null +++ b/Util/samples/Units/Units_x64_vs100.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + {b40ec4c5-25e8-442d-be92-e0493020723e} + + + {91b7c4f6-8714-44f0-a55b-697714a39da8} + + + + + Source Files + + + \ No newline at end of file diff --git a/Util/samples/Units/Units_x64_vs90.vcproj b/Util/samples/Units/Units_x64_vs90.vcproj new file mode 100644 index 000000000..33bd8f3c2 --- /dev/null +++ b/Util/samples/Units/Units_x64_vs90.vcproj @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Util/samples/Units/src/Units.cpp b/Util/samples/Units/src/Units.cpp index c468477c7..1ffcd9227 100644 --- a/Util/samples/Units/src/Units.cpp +++ b/Util/samples/Units/src/Units.cpp @@ -1,36 +1,36 @@ -// -// Units.cpp -// -// $Id: //poco/svn/Util/samples/Units/src/Units.cpp#1 $ -// -// This sample demonstrates the Units. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// Permission is hereby granted, free of charge, to any person or organization -// obtaining a copy of the software and accompanying documentation covered by -// this license (the "Software") to use, reproduce, display, distribute, -// execute, and transmit the Software, and to prepare derivative works of the -// Software, and to permit third-parties to whom the Software is furnished to -// do so, all subject to the following: -// -// The copyright notices in the Software and this entire statement, including -// the above license grant, this restriction and the following disclaimer, -// must be included in all copies of the Software, in whole or in part, and -// all derivative works of the Software, unless such copies or derivative -// works are solely in the form of machine-executable object code generated by -// a source language processor. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - +// +// Units.cpp +// +// $Id: //poco/svn/Util/samples/Units/src/Units.cpp#1 $ +// +// This sample demonstrates the Units. +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// + #include "Poco/Util/Units.h" #include diff --git a/Util/samples/samples.progen b/Util/samples/samples.progen index d89592c1a..ce8b22767 100644 --- a/Util/samples/samples.progen +++ b/Util/samples/samples.progen @@ -4,4 +4,5 @@ vc.solution.create = true vc.solution.include = \ pkill\\pkill;\ SampleApp\\SampleApp;\ - SampleServer\\SampleServer + SampleServer\\SampleServer;\ + Units\\Units diff --git a/Util/samples/samples_CE_vs90.sln b/Util/samples/samples_CE_vs90.sln index 8c9a66623..212079915 100644 --- a/Util/samples/samples_CE_vs90.sln +++ b/Util/samples/samples_CE_vs90.sln @@ -6,6 +6,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\Samp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_CE_vs90.vcproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_CE_vs90.vcproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Digi JumpStart (ARMV4I) = debug_shared|Digi JumpStart (ARMV4I) @@ -70,6 +72,24 @@ Global {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Digi JumpStart (ARMV4I).ActiveCfg = debug_shared|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Digi JumpStart (ARMV4I).Build.0 = debug_shared|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Digi JumpStart (ARMV4I).Deploy.0 = debug_shared|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Digi JumpStart (ARMV4I).ActiveCfg = release_shared|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Digi JumpStart (ARMV4I).Build.0 = release_shared|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Digi JumpStart (ARMV4I).Deploy.0 = release_shared|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_mt|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Digi JumpStart (ARMV4I).Build.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_mt|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Digi JumpStart (ARMV4I).ActiveCfg = release_static_mt|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Digi JumpStart (ARMV4I).Build.0 = release_static_mt|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Digi JumpStart (ARMV4I).Deploy.0 = release_static_mt|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Digi JumpStart (ARMV4I).ActiveCfg = debug_static_md|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Digi JumpStart (ARMV4I).Build.0 = debug_static_md|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Digi JumpStart (ARMV4I).Deploy.0 = debug_static_md|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Digi JumpStart (ARMV4I).ActiveCfg = release_static_md|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Digi JumpStart (ARMV4I).Build.0 = release_static_md|Digi JumpStart (ARMV4I) + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Digi JumpStart (ARMV4I).Deploy.0 = release_static_md|Digi JumpStart (ARMV4I) EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Util/samples/samples_vs100.sln b/Util/samples/samples_vs100.sln index 4adadf7ed..d5c182379 100644 --- a/Util/samples/samples_vs100.sln +++ b/Util/samples/samples_vs100.sln @@ -6,6 +6,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\Samp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_vs100.vcxproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_vs100.vcxproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 @@ -70,6 +72,24 @@ Global {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Build.0 = release_static_md|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Build.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Util/samples/samples_vs71.sln b/Util/samples/samples_vs71.sln index bb87cb617..e3ed66862 100644 --- a/Util/samples/samples_vs71.sln +++ b/Util/samples/samples_vs71.sln @@ -11,6 +11,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServe ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_vs71.vcproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution debug_shared = debug_shared @@ -57,6 +61,18 @@ Global {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md.Build.0 = debug_static_md|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md.ActiveCfg = release_static_md|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md.Build.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared.ActiveCfg = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared.Build.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared.ActiveCfg = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared.Build.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt.ActiveCfg = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt.Build.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt.ActiveCfg = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt.Build.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md.ActiveCfg = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md.Build.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md.ActiveCfg = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md.Build.0 = release_static_md|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/Util/samples/samples_vs80.sln b/Util/samples/samples_vs80.sln index 50849cf2a..105324c08 100644 --- a/Util/samples/samples_vs80.sln +++ b/Util/samples/samples_vs80.sln @@ -6,6 +6,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\Samp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_vs80.vcproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_vs80.vcproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 @@ -70,6 +72,24 @@ Global {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Build.0 = release_static_md|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Build.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Util/samples/samples_vs90.sln b/Util/samples/samples_vs90.sln index 7a9d0871b..e78a34c5d 100644 --- a/Util/samples/samples_vs90.sln +++ b/Util/samples/samples_vs90.sln @@ -6,6 +6,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\Samp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_vs90.vcproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_vs90.vcproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 @@ -70,6 +72,24 @@ Global {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Build.0 = release_static_md|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Build.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Util/samples/samples_x64_vs100.sln b/Util/samples/samples_x64_vs100.sln index d69cc11ce..24a7d3317 100644 --- a/Util/samples/samples_x64_vs100.sln +++ b/Util/samples/samples_x64_vs100.sln @@ -6,6 +6,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\Samp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_x64_vs100.vcxproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_x64_vs100.vcxproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 @@ -70,6 +72,24 @@ Global {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.ActiveCfg = release_static_md|x64 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Build.0 = release_static_md|x64 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.Build.0 = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.ActiveCfg = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.Build.0 = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.Deploy.0 = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.Build.0 = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Util/samples/samples_x64_vs90.sln b/Util/samples/samples_x64_vs90.sln index 4cda49b20..59f92e840 100644 --- a/Util/samples/samples_x64_vs90.sln +++ b/Util/samples/samples_x64_vs90.sln @@ -6,6 +6,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleApp", "SampleApp\Samp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleServer", "SampleServer\SampleServer_x64_vs90.vcproj", "{F475C5DD-0558-37AF-870B-666DE931B7BA}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_x64_vs90.vcproj", "{A6800637-61D5-39A3-86AA-E180C73D3120}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 @@ -70,6 +72,24 @@ Global {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.ActiveCfg = release_static_md|x64 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Build.0 = release_static_md|x64 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.Build.0 = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.ActiveCfg = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.Build.0 = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|x64.Deploy.0 = release_shared|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.Build.0 = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE