diff --git a/Net/Net_CE_vs90.vcproj b/Net/Net_CE_vs90.vcproj index b3f0f890a..a29ae64e6 100644 --- a/Net/Net_CE_vs90.vcproj +++ b/Net/Net_CE_vs90.vcproj @@ -894,6 +894,8 @@ RelativePath=".\include\Poco\Net\RemoteSyslogChannel.h"/> + @@ -901,6 +903,8 @@ RelativePath=".\src\RemoteSyslogChannel.cpp"/> + + Name="debug_shared|Digi JumpStart (ARMV4I)" + ExcludedFromBuild="true"> + Name="release_shared|Digi JumpStart (ARMV4I)" + ExcludedFromBuild="true"> diff --git a/Net/Net_vs100.sln b/Net/Net_vs100.sln index 959aa4526..c166d637d 100644 --- a/Net/Net_vs100.sln +++ b/Net/Net_vs100.sln @@ -10,49 +10,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.Build.0 = debug_shared|Win32 {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.ActiveCfg = release_shared|Win32 {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.Build.0 = release_shared|Win32 {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {B057A1FE-09F7-465E-B8B5-E1B659051D76}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.Build.0 = debug_shared|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.ActiveCfg = release_shared|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.Build.0 = release_shared|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D5EFBF27-B934-4B8D-8AE5-6EC00374819C}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Net/Net_vs100.vcxproj b/Net/Net_vs100.vcxproj index 133c2df09..3534003d2 100644 --- a/Net/Net_vs100.vcxproj +++ b/Net/Net_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,80 +32,80 @@ Net 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)\ - PocoNetd - PocoNetmdd - PocoNetmtd - PocoNet - PocoNetmd - PocoNetmt + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoNetd + PocoNetmdd + PocoNetmtd + PocoNet + PocoNetmd + PocoNetmt - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - POCO_HAVE_IPv6;WIN32;_DEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) true true EnableFastChecks @@ -114,7 +114,7 @@ true true true - + Level3 EditAndContinue Default @@ -132,7 +132,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -140,16 +140,16 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - POCO_HAVE_IPv6;WIN32;NDEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Net_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -166,11 +166,11 @@ MachineX86 - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - POCO_HAVE_IPv6;WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -179,7 +179,7 @@ true true true - + ..\lib\PocoNetmtd.pdb Level3 EditAndContinue @@ -190,7 +190,7 @@ ..\lib\PocoNetmtd.lib - + Disabled OnlyExplicitInline @@ -198,16 +198,16 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - POCO_HAVE_IPv6;WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded false true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -215,11 +215,11 @@ ..\lib\PocoNetmt.lib - + Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - POCO_HAVE_IPv6;WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true true EnableFastChecks @@ -228,7 +228,7 @@ true true true - + ..\lib\PocoNetmdd.pdb Level3 EditAndContinue @@ -239,7 +239,7 @@ ..\lib\PocoNetmdd.lib - + Disabled OnlyExplicitInline @@ -247,17 +247,17 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - POCO_HAVE_IPv6;WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false true true true - + ..\lib\PocoNetmd.pdb Level3 - + Default %(DisableSpecificWarnings) @@ -267,202 +267,204 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - true - true - true - true + true + true + true + true + true + true - - - \ No newline at end of file + + + diff --git a/Net/Net_vs100.vcxproj.filters b/Net/Net_vs100.vcxproj.filters index 6f5a6f9e3..99be453f5 100644 --- a/Net/Net_vs100.vcxproj.filters +++ b/Net/Net_vs100.vcxproj.filters @@ -2,130 +2,130 @@ - {066be63d-d2cc-4543-84b7-282616920aa3} + {1fd9c20c-05af-4b46-9165-9ad08b01d4f7} - {c9e9606c-ff7b-450c-8571-d7088758f525} + {6a6c5a53-2ec4-42ec-90eb-87811b184cab} - {0158f8b7-311d-417e-a868-887ee734f17a} + {031bcbaa-a4ab-4e0d-9860-2683eb654de9} - {f07c41b9-24ca-4c1d-94c1-056bd8c9fb24} + {49b6d87d-e831-4e6c-97b5-e8e6ff2082dc} - {db59fa3e-f109-4ce7-aeaf-53e79ddceb8c} + {ea21e559-d811-4a36-a6c4-2d02b0b0afb3} - {7b94eb13-e6f1-4fe8-bf58-569ca841da39} + {be479a18-3ca3-4dca-afdc-c1eb94ef2f11} - {d634c5ce-8eda-4d77-aaf8-71674c1ab2dc} + {5ea8a3dd-6816-4175-a9cc-99f02ddab4c5} - {b1145a9f-595c-4467-bc37-0a7f6cb54aab} + {a73f406e-35ea-41ad-bb2d-bf28630e9476} - {44844c83-fa28-4cbd-8e77-9b01ebbc24f2} + {886b9c6f-3333-47bb-86c4-02c31b0409e7} - {e481d2dd-ee7b-44d6-85b8-e1e1b37a1d2b} + {98c697d8-1008-43a0-9f7a-e1780b3f01ba} - {f041d7f1-38bc-4538-aaba-8941f4ac748e} + {dedd83c0-ae61-450d-b7b9-0e5c646964b1} - {40ad861e-9c6f-4046-8e87-4e60ac89aecc} + {1d63b7e5-609d-4056-b3ee-59a3aad4739a} - {c26fe2a2-a8b5-4c8e-b9e9-d7e78ef2f5d8} + {420b86ac-917d-4758-8644-24bbfdc94c52} - {752aa25a-4a0f-45c0-84e6-e1e6f38eb44c} + {f4f456c9-9f28-4359-b8a6-4df07a356f11} - {c9b95086-8b4f-4a92-ba0a-418dcf4b4c1b} + {9da0d92b-8e5d-4972-ab63-3131890927cc} - {4435ba77-db96-4761-a0e8-347ea63fa4df} + {7ed901cc-dbc8-4705-a4c2-b76e9d2fd042} - {2708469d-6e2a-403e-ae38-3bf62df98060} + {d460f2fb-9bc6-4031-a4d7-0a2158673b7f} - {51936df3-5b33-45da-9825-5aceb690d9d5} + {7582982d-4752-4d74-8884-7606b743a314} - {1a83f690-c71b-4609-a33b-1f0102f3291b} + {df1ab3bc-6408-4215-9d49-48a10fa7bbd1} - {702383f8-3dc4-4b66-9a5d-34cc4b9701a7} + {1251e86b-afb2-4339-81fb-80c48e65fe58} - {de5c5312-d7eb-4138-a508-2a06c4014947} + {e2071a92-1394-438a-b052-188f5e8b81f2} - {c77b11ad-2e6a-46a0-8f44-81fa011c241d} + {6b6736e9-a96c-43a6-8afc-22d278d233d0} - {99f1cb0e-885d-4d05-89dd-00e8169e8999} + {264a07bb-7184-4b3e-b587-86b105e14861} - {86e322c5-7d9a-4869-a09c-e6b3666c885b} + {c2a5d312-8e12-4630-b433-169e7cbf0424} - {41c6f33f-cb1c-4774-a238-8a14416c7487} + {2d841c76-b391-463f-af55-3bd4501b1166} - {370c3e91-aa68-40f4-9f46-3576897e14e4} + {cb7c05cb-679c-4d48-b852-faa1631a07d0} - {7246c556-8412-497c-9d2a-c5d972c17255} + {167ea738-ba86-49b8-aafc-8a43cb0d1c9a} - {0db14096-e483-401c-9e9e-5cec77cfc300} + {bd8c6044-ef06-4fdb-bc6b-65678f064b33} - {4c562d06-e01c-440f-bfa7-8d0d8428a5f9} + {c2802df1-ee71-4fd0-a19b-9dd3e2fbde51} - {2c4b4ff7-3587-4ccc-8c77-839ec4fffbef} + {4ab7b6e7-0282-40af-a9ff-0af14b482f80} - {ee71d9c6-1031-41ce-b165-7baba46fc19d} + {1dc1cf4d-4cb2-4dc3-9ed8-6adc242b1ff7} - {973b0e54-9251-4db0-bc1c-012d6c9854dc} + {fc4a9917-aa15-4cb6-9a04-059549640bf8} - {78bbcb54-a180-4ef7-a493-be6ab57332af} + {adb48dfd-09df-4808-a20f-8df3fe5a2e5b} - {da0623d5-73b4-4836-8e1a-6068c3d96dee} + {d6e982dc-378d-48fa-8ff7-5bb4ef894ed2} - {6bbc87fd-7d32-4479-8c3a-5ce15b99dac6} + {db30c559-5eb2-4bf5-86c4-96973749dc73} - {8578c488-e746-41f0-8a3e-ada7e77fabe2} + {75c504b3-341d-43ad-9276-4939b9fd81b4} - {70f5663a-0a88-41de-8e3e-b6c2475a0716} + {c9c368f0-bc7a-4297-8339-8add42852318} - {4be74d06-2af9-416c-8810-854a9c4f0201} + {5c3d647f-dc83-46b3-9f10-85559cc47f59} - {5141345c-f280-4e44-ad68-8415eb808b81} + {bc3837ce-3478-4cc9-a5fe-def209f86de1} - {5c57283f-b250-412b-97f4-0ff65d9f8b8d} + {8b7ce99e-7134-4d3e-be12-1da260f2addc} - {e874dd57-43d2-4788-9cea-a749e7581142} + {a5d9d62f-4e6c-44e7-8175-f22b47618f4d} - {6c199931-d024-4c71-aa2e-ef7e4741a958} + {9e8d3dd2-8950-4437-b83d-0f5c2acdf755} @@ -144,6 +144,9 @@ NetCore\Header Files + + NetCore\Header Files + NetCore\Header Files @@ -402,21 +405,15 @@ Logging\Header Files + + Logging\Header Files + WebSocket\Header Files WebSocket\Header Files - - NetCore\Header Files - - - Reactor\Header Files - - - Reactor\Header Files - @@ -431,6 +428,9 @@ NetCore\Source Files + + NetCore\Source Files + NetCore\Source Files @@ -677,15 +677,15 @@ Logging\Source Files + + Logging\Source Files + WebSocket\Source Files WebSocket\Source Files - - NetCore\Source Files - diff --git a/Net/Net_vs110.vcxproj b/Net/Net_vs110.vcxproj index 989214b2a..f75edbbb0 100644 --- a/Net/Net_vs110.vcxproj +++ b/Net/Net_vs110.vcxproj @@ -365,6 +365,7 @@ + @@ -456,11 +457,19 @@ + - + + true + true + true + true + true + true + diff --git a/Net/Net_vs110.vcxproj.filters b/Net/Net_vs110.vcxproj.filters index f826bae26..83be7064f 100644 --- a/Net/Net_vs110.vcxproj.filters +++ b/Net/Net_vs110.vcxproj.filters @@ -2,130 +2,130 @@ - {41246b3c-8ae8-46ee-8a56-cf47b2549723} + {88b508f9-076e-4f63-896f-978172fe8918} - {e5c28994-f0f6-41bc-8178-499fcb282849} + {15a8353f-bd11-4736-93ab-ec2091521aa3} - {ff99acfe-4edc-4d85-8918-1cb2af3326b5} + {433321e2-70cc-4c3c-8bc8-30fbd1ae73a5} - {7067216d-3e61-4411-bb43-580a22fa2c83} + {542b7d1a-c36f-49ec-bf84-e71296e7dc1f} - {4905c507-63de-4274-b0a4-85b97c35c80c} + {6ba64e20-8971-4285-9376-9bfb48f00c00} - {c23e0d96-c6d1-416b-a49f-920d8e3f06c1} + {0bfad08c-82d8-403e-95dd-2834943d8a93} - {14ee7f7f-7805-4185-99ab-ea87ab6f554d} + {048a49f1-cfe9-4d05-9587-477832a3e22f} - {c07b18a4-6dec-4c8c-a447-057a2408f10c} + {006e8f63-8d31-4f24-a95b-4da971f0485e} - {98a99919-557d-4747-8ea7-de9dd515097a} + {603f876f-98cf-4653-968b-681025fa0f59} - {d29d6597-1b74-4a66-adeb-2039faef542c} + {44f4d194-90a0-43ad-905e-4ee03ebd118d} - {eb9fa3be-8c8b-411a-b05a-0c93e87713bf} + {bde1cfb1-e931-4f24-80ee-154397837879} - {5f161b32-3565-4249-8610-a34683e038a0} + {fed31122-0082-4d5e-8094-a9c4f820af39} - {cccbeeae-03b5-4e2e-8b7f-8251bc1c6e6e} + {5a9d0360-160a-4d5f-8252-ae7b82fefd1b} - {8623f5bb-8f6f-4f5d-add1-fa6d3666563c} + {1ba58e68-0664-4553-9b8b-3329c4df0724} - {81eb767a-d02e-4912-9678-a6b683682d6e} + {48f85270-d833-491f-a68d-d36541f99d31} - {d82a7e1c-95a4-4c2b-9414-2a419abbd252} + {4bf62840-f99d-4915-9125-759315d3be09} - {7125e354-f151-4234-a11f-90070d30c4bd} + {aa267629-d879-430e-8b4f-86e20c2d258f} - {89a0b8ef-b58c-45bb-9436-6fac96830313} + {43df5d03-4705-4c24-a4d2-f5c452dec26b} - {6ab9b940-72dd-4f8e-8202-ba61a034393c} + {35d608e8-3cf9-4207-8617-5105979d6f95} - {d4631c5a-0927-4d4a-8542-d2a943ef229b} + {a71d64f2-1a24-4e2d-8496-a0a66f30b3b5} - {b6fe2fe7-e445-4eae-a008-0a2a391f3d66} + {4e059fc6-9897-41b8-b34e-b8f83d6b7025} - {7452d39c-5d11-45da-be84-1c3d528d2323} + {0855453c-f7d7-4a41-81c6-852a019549eb} - {6eeba124-1ea1-4dc3-9a9b-9ff84507a972} + {99e23efc-cc28-423d-bc10-fee57916078c} - {35ba6d59-2bf7-4762-84c3-9a373a9b3718} + {6a10a18f-80a9-4ad4-9d9c-063d32d8dfa4} - {c66e401e-0799-4646-b4f4-e1bb8e16defa} + {30e6a266-58ae-42ea-864e-bc3c92581f13} - {fc61dc48-90ed-48c2-b24b-d121fcd7db91} + {02f2ddf6-e8a5-4889-8fd6-c5e1ccb8e553} - {43ea985c-7c04-4c5b-aa50-c29a0b73fc9d} + {fd8eb857-dff6-4d3e-96df-2ffda6294550} - {a4998ac9-9dc9-447c-87db-436d7f0c4b4f} + {65f633ed-f550-4521-8d77-786cd241a289} - {31d1f81e-cf65-4d29-a911-55ddb53baaa3} + {0f13024a-3ed3-489c-a0ea-077d75e4c566} - {462d85ab-5555-4cf0-946e-ac82f36304c4} + {59888127-14c5-4a50-a97d-e586e5a0514c} - {6c65a9af-6848-4ecb-93bf-f091377197d0} + {dbedc324-fe03-4c41-a273-022b5a5170cd} - {cbbc5092-00d8-442b-8fa7-0739a1cd715b} + {aaeffeb0-d1d0-4d82-966a-5efc392733fb} - {7caf10bb-45ef-48e5-9458-d50f8c741935} + {14837134-99f9-4932-8c16-e8fc2cf06959} - {83660ad8-d5c6-49d8-be22-377aca6ed528} + {3c25c1ab-3295-4661-8183-af56b07cd4e3} - {f4745bd1-7446-426b-8a55-0807e1d8857a} + {a5c48a8e-cc06-4990-8c8b-fc8aac09548c} - {b9d99bc3-e64d-4c71-b00f-e8d9208e13f2} + {5d8f0dc0-e8d4-4798-ac75-caf2af55f6ff} - {0f99d7c1-4fdb-4ff4-9af6-2a89910b2adf} + {abe74806-0c96-4b3f-b53b-276d535280fd} - {c09f35c4-0406-4ec9-9fe8-1c4db404b619} + {1a3734b6-3ceb-4d50-bed4-2573f71bc3b2} - {c36f08c4-7202-4712-8253-70647ab29dd7} + {485f9a7a-90a8-4479-ae11-d92ce866bfd9} - {74fd12a4-00e2-4ea3-9285-adb22479cb1a} + {0e595ff7-6049-4673-98fe-f6593609d425} - {225c2c50-ef2e-45a9-8cb7-9debf5733714} + {cb96a05c-19e3-42f1-b394-8c61c97f03a6} - {1ca835af-defd-4333-b136-76f531bdaf4b} + {865a0e39-c61d-47ef-af4a-8ecc4640e5b0} @@ -405,6 +405,9 @@ Logging\Header Files + + Logging\Header Files + WebSocket\Header Files @@ -674,6 +677,9 @@ Logging\Source Files + + Logging\Source Files + WebSocket\Source Files diff --git a/Net/Net_vs71.vcproj b/Net/Net_vs71.vcproj index b2505406b..1984e5bb4 100644 --- a/Net/Net_vs71.vcproj +++ b/Net/Net_vs71.vcproj @@ -826,6 +826,8 @@ RelativePath=".\include\Poco\Net\RemoteSyslogChannel.h"/> + @@ -833,6 +835,8 @@ RelativePath=".\src\RemoteSyslogChannel.cpp"/> + + Name="debug_shared|Win32" + ExcludedFromBuild="TRUE"> + Name="release_shared|Win32" + ExcludedFromBuild="TRUE"> diff --git a/Net/Net_vs80.vcproj b/Net/Net_vs80.vcproj index 529414041..87f2ec494 100644 --- a/Net/Net_vs80.vcproj +++ b/Net/Net_vs80.vcproj @@ -847,6 +847,8 @@ RelativePath=".\include\Poco\Net\RemoteSyslogChannel.h"/> + @@ -854,6 +856,8 @@ RelativePath=".\src\RemoteSyslogChannel.cpp"/> + + Name="debug_shared|Win32" + ExcludedFromBuild="true"> + Name="release_shared|Win32" + ExcludedFromBuild="true"> diff --git a/Net/Net_vs90.vcproj b/Net/Net_vs90.vcproj index c34d6c0ab..2e87af526 100644 --- a/Net/Net_vs90.vcproj +++ b/Net/Net_vs90.vcproj @@ -846,6 +846,8 @@ RelativePath=".\include\Poco\Net\RemoteSyslogChannel.h"/> + @@ -853,6 +855,8 @@ RelativePath=".\src\RemoteSyslogChannel.cpp"/> + + Name="debug_shared|Win32" + ExcludedFromBuild="true"> + Name="release_shared|Win32" + ExcludedFromBuild="true"> diff --git a/Net/Net_x64_vs100.vcxproj b/Net/Net_x64_vs100.vcxproj index 3bc880a8f..bcc8b846c 100644 --- a/Net/Net_x64_vs100.vcxproj +++ b/Net/Net_x64_vs100.vcxproj @@ -270,13 +270,13 @@ + - @@ -357,6 +357,7 @@ + @@ -365,12 +366,12 @@ + - @@ -448,13 +449,16 @@ + + true true true + true true true diff --git a/Net/Net_x64_vs100.vcxproj.filters b/Net/Net_x64_vs100.vcxproj.filters index 835662dc7..da1dbebd0 100644 --- a/Net/Net_x64_vs100.vcxproj.filters +++ b/Net/Net_x64_vs100.vcxproj.filters @@ -2,130 +2,130 @@ - {5f22a693-d39d-4dc3-967e-4e534ed1debc} + {c5d8920b-64b9-4b65-80cf-b86964da17d3} - {34cea09f-94e5-4872-a3e7-07fb5e32e78e} + {e87b9c84-f8fd-45f2-85cb-dbd068f8bff2} - {a2b078e6-4ced-434d-9fc5-db7db484ebd9} + {3ea56d63-57ec-44df-8a14-c11d90dcd81c} - {eac0b7e4-1f28-445a-a089-92c7ce19a029} + {f9ab1126-4ef7-431b-a067-4252a7ce6555} - {3cb90562-bdfd-4046-a149-cc475564ab77} + {aa433c8a-79a9-4858-abcb-675c5ad40a0b} - {fe6f4050-70e7-4c36-8e14-f2dace433a4c} + {4eb17c31-97ec-49b9-8a3e-667409496950} - {3ed5fbf3-179c-4108-83ba-97cebdd1ab97} + {3f96fd5e-af74-40e2-b33f-006f6cedbece} - {76a47096-1f91-4c92-998c-476b4bba8895} + {eef312e2-c3e0-4814-8d4b-89c702dd9683} - {2648308d-2bbe-4aaf-86e5-b276aca34258} + {a46312e5-3264-4722-9e69-af3a53531e5f} - {7e55249d-eb6f-49de-abe2-23f02d59b8d2} + {cfece798-e297-4bda-95a9-a4d4b32abd6f} - {f3883ba3-3a90-4b51-9196-d16cd740a3d7} + {c1b91262-4d8d-4306-adc9-8fc49fc10dc2} - {4b8e7973-d93a-4322-a189-c41eb8d0ba68} + {e899e1b5-136e-45cc-a9b2-ae0b794fdbaf} - {ad828f54-b5e5-47a1-9593-5d36c7456d43} + {c94f7f0c-78e6-46bd-a68d-141bc3b8ef3f} - {bf8d6b46-870e-4741-88f7-88830d56b2fd} + {8413818c-d278-484d-8681-6aafb096d339} - {91a0ac23-4142-470a-9e3a-32832925ae9f} + {b210f473-63e8-43a8-8edc-80a27e763a7d} - {605cd2ff-5b47-47ba-84e6-6301f8321464} + {b19a99c3-2244-4d10-8551-f3e4d89060d7} - {e4c59611-a9a7-48c2-bd62-270045cf2857} + {bced8d73-9488-486c-88d7-c3e7a47dcf2a} - {218086d8-9ad4-413d-9295-6f5fcb7dbda6} + {af280bac-26d0-498d-a091-77b1a6c2919e} - {6a3f39d2-b27d-436b-bb9f-6643ce7b5c3b} + {b06eeb02-9870-430c-844f-9ddb6d0cca87} - {d6c5961e-85f5-4f4b-98c6-171547bed41c} + {f840386a-0541-4fb0-94d9-4b13d33f1052} - {10f35426-cbb2-4022-bb4b-88b3ed3b5b59} + {718dced1-ae6d-4116-a558-4860b09d6af6} - {f533777b-fcab-4d44-a38f-cd2852031ae5} + {356e3a77-343d-458a-a671-f347efd21035} - {ff1761ab-d8f6-4141-984d-d9a7a81e91d2} + {f056e10e-6f54-4007-a312-49febbc8541b} - {797280a5-0093-4074-8141-c7f38ffc4a4d} + {f38fe597-433e-4bcd-89cd-e57a2f9d2ea3} - {c9d19c34-5444-4159-8e18-da4f1d1c7313} + {de61f07f-b9f1-4691-ab6d-dcb607cf41a3} - {93fbf4ac-7093-4a56-b922-f4f58576c365} + {225cb557-f6f7-4689-a7bb-434f62a4e1b3} - {0f444170-7d07-47fd-9805-f83049863494} + {c95376ab-05ff-4bc6-afc1-6271c09873d1} - {6ac380ec-f26f-4507-a1f0-73f15e3ff809} + {73a3109c-c78f-4323-9ab5-c49afc9546c8} - {37ea1f2d-2174-4209-b2bb-cd48af88b124} + {fb248483-4141-49fa-8c84-e40408029187} - {81b637d4-2086-477d-a5e1-273d1ffce5e8} + {14e50b00-d39a-4d73-a542-c52984879990} - {92830cd6-adda-4b08-b957-703c6da92639} + {b1952662-bfbb-40ec-9fa5-511cf9c97d95} - {5743e50a-1942-4cb9-abcd-3c9a4931be07} + {58cc9964-649f-4d0a-96be-cd1bd09b5164} - {27603c44-bc41-47a2-9519-8acafae28c91} + {08a01311-31e8-4659-8aae-61781dcd64eb} - {336ac4ee-c320-4497-b94a-70368aafc63b} + {f1cbd846-9f6a-455f-9bac-38d5467e59a9} - {73cba921-73bc-4468-8f02-fb2b02ab2ece} + {ae60d501-8703-4cbb-8f09-4b83fdf062e2} - {57b3e9b4-a6a4-43f3-8f21-e6e47946915d} + {46dac0df-f84f-4574-b2c2-d39e4692e3db} - {ff3677e5-c5b5-42d4-b721-9bd9866a9551} + {5c9102d1-5f6e-4f99-8a71-0ff41ed303ac} - {b43b0ff9-3f9c-413c-af12-3b377d2b451e} + {7988d98a-4743-466a-ad13-3dc5c299cc55} - {27fadf1f-d277-4205-b580-afb7ce0f9ce1} + {1469b9a9-9dea-4377-8862-ea32a54a9396} - {aa103f12-0aa7-4a2a-b0bc-b18e41d30804} + {62fa9c70-a870-424d-a4c4-48dfc5ab026d} - {44d5fd89-073a-4596-9e98-730e14369891} + {36d4409e-da1a-4952-8a5e-12e8588370d8} - {6a67a9ab-652b-4573-a211-1fa470660c91} + {c3eaac3d-8266-4bfa-ab70-9854c1b927fa} @@ -144,6 +144,9 @@ NetCore\Header Files + + NetCore\Header Files + NetCore\Header Files @@ -402,15 +405,15 @@ Logging\Header Files + + Logging\Header Files + WebSocket\Header Files WebSocket\Header Files - - NetCore\Header Files - @@ -425,6 +428,9 @@ NetCore\Source Files + + NetCore\Source Files + NetCore\Source Files @@ -671,15 +677,15 @@ Logging\Source Files + + Logging\Source Files + WebSocket\Source Files WebSocket\Source Files - - NetCore\Source Files - diff --git a/Net/Net_x64_vs110.vcxproj b/Net/Net_x64_vs110.vcxproj index b84d24446..9a66b6910 100644 --- a/Net/Net_x64_vs110.vcxproj +++ b/Net/Net_x64_vs110.vcxproj @@ -363,6 +363,7 @@ + @@ -454,11 +455,19 @@ + - + + true + true + true + true + true + true + diff --git a/Net/Net_x64_vs110.vcxproj.filters b/Net/Net_x64_vs110.vcxproj.filters index 26cd853fb..047f89c10 100644 --- a/Net/Net_x64_vs110.vcxproj.filters +++ b/Net/Net_x64_vs110.vcxproj.filters @@ -2,130 +2,130 @@ - {bc3e796f-6cae-4502-ba8a-15b8b637252f} + {f5c14a6e-f421-4392-b282-ff5c78811048} - {61d122fa-94bb-4835-8f48-8b10cd59d0db} + {f000a1b0-df38-467f-9d1e-b06f03c7e7be} - {d095b188-d184-4330-afdc-0dc1438069f6} + {7fc5dc26-8b25-4557-8151-ff5727c3a3e1} - {4567d8d6-c4d2-459b-9d49-3f6dfdd53713} + {cfa3bc22-f1e0-4051-98e1-48b45c08260c} - {2dd6d43c-e1e7-4b09-b890-2a699da57572} + {ef9e853a-e078-47d1-8495-7ebf5a12d6ab} - {8571d650-b599-469e-a4eb-33b9e7eefca6} + {8e5dc4d7-af79-4d50-aa0e-1863db5a946e} - {7162aafe-6585-42e7-ba85-4d2f8736d9e4} + {e218a96c-a9e6-4a00-a6f5-616cf0b8cd70} - {271df83c-8bc4-4364-bfd3-219cf8f3d167} + {39a6e47e-c373-46a4-9797-65ecdba198ad} - {b9aba4a0-f17d-4881-8f37-1b3bba4f88f0} + {5ff338ed-4bb8-458c-89a1-dfeab0b5ecf1} - {11bc698f-4b86-4dd6-a93a-821d01934963} + {e08f08f7-d316-4148-ab83-72a28343bc7c} - {e5d91923-cbc8-44d7-99f8-96d29c3787d4} + {d8047ab8-d8e9-4b3f-9d15-972bbaf7cb77} - {544dc67e-7915-4257-bd9d-767b4d42ee73} + {a6ed56b8-b1c9-4ee5-be33-1f476c6c9cb8} - {0b6680f6-7e18-405d-ba24-fa1d8d5eba3c} + {5913ae13-407d-46d4-965e-4e704749287a} - {f37458df-a729-4c8b-9472-cc18ab890984} + {d7de78e6-859c-471c-90c0-6203e6fbc5c3} - {788f2535-c470-42e7-a4e0-72f86d760188} + {48abb7e6-1f49-4441-a50d-65aaaf89df93} - {e9699b2d-6118-49db-8948-412d60831682} + {d104e8d6-5227-4478-8ff7-42a1b1a6e828} - {98fefc4a-816f-45aa-9703-ade2f9c7dead} + {e7be3d29-7ded-44d4-8138-08d0c8bbe0ba} - {82180935-6bd0-46c0-bcea-a503747c0b2a} + {142762c3-465f-49d7-b9fd-f9fe96799d67} - {de1cc160-a999-45d3-b7eb-a68e29d14069} + {e8b1e4cf-bbff-4c0b-a2da-05b51f3fa17b} - {a4244843-7299-45de-ab4d-39f5a4dc97c8} + {54d8dc43-6251-46db-8ae8-1c55e1d86f1d} - {1a5ea38d-8296-4180-aa33-a47ca555a983} + {5667e05b-0b10-498f-9fbc-c89f67e4974a} - {5b51aae2-a362-44cb-b2e8-0d21d7456b03} + {74834f9a-1e90-4051-a027-433a906a9252} - {fd94425e-c581-4520-be70-f10695d8e38f} + {c4fd5690-f2fc-4088-a010-905f4ea434d6} - {0ba4188b-360a-4924-b927-93c728cedd35} + {b1f23355-95dd-47d8-a8fd-eec837f4537f} - {a9e242bb-8ea9-48d1-aab3-eaca6db2537e} + {b1f01317-05d1-4a9b-8b5d-7c9f37916d04} - {ebd01f88-48e0-47e2-b812-8a6f4a688c8f} + {76a13dc7-95cf-4334-8516-f2fe32d675f4} - {58796ea4-e0be-4ba3-af05-38c60f026487} + {c4a4e6af-8127-487b-b5e6-c389a2912a0e} - {622c9ea1-db95-421a-b740-becfcbb51cbf} + {e33482e7-f57c-4d8f-a838-b122e2aab325} - {5bc6e53d-f721-47b7-b0d7-de694fea5828} + {72c401d7-3c6e-4a28-8224-19591609cdff} - {2f8ac020-2fba-4ecc-b02b-750168c7ac60} + {568219dc-7876-4ced-b124-71e73a64c6bb} - {44f7160b-045a-49f1-ade3-90dd0a72c33c} + {ad5b9c16-e7b4-43ca-b4d2-9e197ede3ed5} - {1d5420ad-8c18-4fa1-b7f5-4fa5c0d52904} + {a5144bfb-efd8-4a8f-bd8f-62a436c2191d} - {92a7d6c1-0365-4a86-8c77-f3406f3c0f45} + {ebf092f8-033a-43dc-98b0-2dc340f7e617} - {e89dcba4-ec8e-4d01-830e-92566691c3cd} + {fe6221d4-0f2d-4f68-baf0-b9301b8fe88f} - {fec71360-3307-4179-875b-caa51530d838} + {57465ff8-2989-471b-b50a-ed34562a8b4f} - {66c86e66-7e59-43d5-9c77-791c75c80d77} + {0a319d35-3502-402b-969a-1a0d46c1ca31} - {6cdd763c-7d28-459c-a993-a2f8e8d610e0} + {b2c4b363-274c-4458-b480-3052da794996} - {9da78d39-5bfc-40e3-bd05-12419641df96} + {97860448-64d5-4043-8863-ab9e304c61ae} - {04aea458-7c57-4d6d-bebd-776441ee9970} + {004afbd5-b224-409f-a725-d69d61b312ae} - {4c7f60d5-5b6a-4e73-a83f-718622be06c9} + {46d1a77d-35ad-4283-9739-1a25e7008704} - {ca5b6ab7-0e21-4343-93fb-cdadb4c869b9} + {21e3d60a-db44-467a-9032-6b0e2c0d171c} - {39c2b166-617f-46e8-9242-653a907f147c} + {f40e009f-a900-4907-b60c-5e5b4f4ac9f0} @@ -405,6 +405,9 @@ Logging\Header Files + + Logging\Header Files + WebSocket\Header Files @@ -674,6 +677,9 @@ Logging\Source Files + + Logging\Source Files + WebSocket\Source Files diff --git a/Net/Net_x64_vs90.vcproj b/Net/Net_x64_vs90.vcproj index 5d477c25d..c8bdcaa38 100644 --- a/Net/Net_x64_vs90.vcproj +++ b/Net/Net_x64_vs90.vcproj @@ -851,6 +851,8 @@ RelativePath=".\include\Poco\Net\RemoteSyslogChannel.h"/> + @@ -858,6 +860,8 @@ RelativePath=".\src\RemoteSyslogChannel.cpp"/> + + Name="debug_shared|x64" + ExcludedFromBuild="true"> + Name="release_shared|x64" + ExcludedFromBuild="true">