- Ping: added to solutions

git-svn-id: http://svn.miranda-ng.org/main/trunk@2543 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 126 insertions, 192 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index f10c9b7cbc..9ec365da1f 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -357,6 +357,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugin
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmLanProto", "..\protocols\EmLanProto\amdproto.vcxproj", "{2115FEBC-1EC4-4F95-A058-A523ED5295A4}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PingPlugin", "..\plugins\Ping\ping.vcxproj", "{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1581,6 +1583,14 @@ Global
 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|Win32.Build.0 = Release|Win32

 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.ActiveCfg = Release|x64

 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.Build.0 = Release|x64

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|Win32.Build.0 = Debug|Win32

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|x64.ActiveCfg = Debug|x64

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|x64.Build.0 = Debug|x64

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Release|Win32.ActiveCfg = Release|Win32

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Release|Win32.Build.0 = Release|Win32

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Release|x64.ActiveCfg = Release|x64

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 11d9aca170..22afee5641 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -393,6 +393,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugin
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmLanProto", "..\protocols\EmLanProto\amdproto.vcxproj", "{2115FEBC-1EC4-4F95-A058-A523ED5295A4}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PingPlugin", "..\plugins\Ping\ping.vcxproj", "{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1617,6 +1619,14 @@ Global
 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|Win32.Build.0 = Release|Win32

 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.ActiveCfg = Release|x64

 		{2115FEBC-1EC4-4F95-A058-A523ED5295A4}.Release|x64.Build.0 = Release|x64

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|Win32.Build.0 = Debug|Win32

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|x64.ActiveCfg = Debug|x64

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Debug|x64.Build.0 = Debug|x64

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Release|Win32.ActiveCfg = Release|Win32

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Release|Win32.Build.0 = Release|Win32

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Release|x64.ActiveCfg = Release|x64

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -1756,6 +1766,7 @@ Global
 		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{D3D80E27-D099-41EC-AFB2-A891A33F1608} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

+		{F31BD1B6-EE9D-4F76-A047-F8AEADC26086} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}

 		{9DE1F0B0-B9D1-4681-82E7-13CC3E047445} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

 		{07137F45-8B5F-4561-BEC8-B883E9123785} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

 		{7DF5234A-A93A-47AD-8201-377ECF59AE5F} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}

diff --git a/plugins/Ping/ping.vcxproj b/plugins/Ping/ping.vcxproj
index 9d3b0a879e..51a3b5d4db 100644
--- a/plugins/Ping/ping.vcxproj
+++ b/plugins/Ping/ping.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>ping</ProjectName>

+    <ProjectName>PingPlugin</ProjectName>

     <ProjectGuid>{F31BD1B6-EE9D-4F76-A047-F8AEADC26086}</ProjectGuid>

     <RootNamespace>ping</RootNamespace>

     <Keyword>MFCProj</Keyword>

@@ -77,7 +77,6 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>

-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EmbedManifest>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>

@@ -86,7 +85,6 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>

-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</EmbedManifest>

     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>

     <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>

   </PropertyGroup>

@@ -102,16 +100,13 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PING_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

-      <ObjectFileName>.\Debug/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

@@ -119,12 +114,12 @@
     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Culture>0x0c09</Culture>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>user32.lib;gdi32.lib;ws2_32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Debug/pingplug.pdb</ProgramDatabaseFile>

       <BaseAddress>0x22040000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

@@ -135,8 +130,11 @@
     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug/ping.bsc</OutputFile>

     </Bscmake>

+    <Manifest>

+      <OutputManifestFile>

+      </OutputManifestFile>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <Midl>

@@ -149,33 +147,30 @@
       </HeaderFileName>

     </Midl>

     <ClCompile>

-      <Optimization>MinSpace</Optimization>

+      <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>../../include;../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PING_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>Sync</ExceptionHandling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

-      <ObjectFileName>.\Release/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Culture>0x0c09</Culture>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>ws2_32.lib;wsock32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Release/pingplug.pdb</ProgramDatabaseFile>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>0x22040000</BaseAddress>

@@ -185,11 +180,15 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release/ping.bsc</OutputFile>

     </Bscmake>

+    <Manifest>

+      <OutputManifestFile>

+      </OutputManifestFile>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <Midl>

@@ -203,11 +202,11 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;PING_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

@@ -217,12 +216,12 @@
     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Culture>0x0c09</Culture>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>user32.lib;gdi32.lib;ws2_32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Debug/pingplug.pdb</ProgramDatabaseFile>

       <BaseAddress>0x22040000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

@@ -233,8 +232,11 @@
     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug/ping.bsc</OutputFile>

     </Bscmake>

+    <Manifest>

+      <OutputManifestFile>

+      </OutputManifestFile>

+    </Manifest>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <Midl>

@@ -247,11 +249,11 @@
       </HeaderFileName>

     </Midl>

     <ClCompile>

-      <Optimization>MinSpace</Optimization>

+      <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

-      <AdditionalIncludeDirectories>../../include;../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;PING_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>Sync</ExceptionHandling>

@@ -267,12 +269,12 @@
     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Culture>0x0c09</Culture>

+      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>ws2_32.lib;wsock32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Release/pingplug.pdb</ProgramDatabaseFile>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <BaseAddress>0x22040000</BaseAddress>

@@ -282,110 +284,44 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX64</TargetMachine>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release/ping.bsc</OutputFile>

     </Bscmake>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="icmp.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="log.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="menu.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="options.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="ping.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="pinggraph.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="pinglist.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="pingthread.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="rawping.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-    <ClCompile Include="utils.cpp">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="collection.h" />

-    <ClInclude Include="common.h" />

-    <ClInclude Include="icmp.h" />

-    <ClInclude Include="log.h" />

-    <ClInclude Include="menu.h" />

-    <ClInclude Include="options.h" />

-    <ClInclude Include="ping.h" />

-    <ClInclude Include="pinggraph.h" />

-    <ClInclude Include="pinglist.h" />

-    <ClInclude Include="pingthread.h" />

-    <ClInclude Include="rawping.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="utils.h" />

+    <ResourceCompile Include="res\ping.rc" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="green.ico" />

-    <None Include="grey.ico" />

-    <None Include="ico00001.ico" />

-    <None Include="icon1.ico" />

-    <None Include="icon2.ico" />

-    <None Include="icon3.ico" />

-    <None Include="red.ico" />

-    <None Include="yellow.ico" />

+    <ClInclude Include="src\collection.h" />

+    <ClInclude Include="src\common.h" />

+    <ClInclude Include="src\icmp.h" />

+    <ClInclude Include="src\log.h" />

+    <ClInclude Include="src\menu.h" />

+    <ClInclude Include="src\options.h" />

+    <ClInclude Include="src\ping.h" />

+    <ClInclude Include="src\pinggraph.h" />

+    <ClInclude Include="src\pinglist.h" />

+    <ClInclude Include="src\pingthread.h" />

+    <ClInclude Include="src\rawping.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\utils.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="ping.rc">

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

-    </ResourceCompile>

+    <ClCompile Include="src\icmp.cpp" />

+    <ClCompile Include="src\log.cpp" />

+    <ClCompile Include="src\menu.cpp" />

+    <ClCompile Include="src\options.cpp" />

+    <ClCompile Include="src\ping.cpp" />

+    <ClCompile Include="src\pinggraph.cpp" />

+    <ClCompile Include="src\pinglist.cpp" />

+    <ClCompile Include="src\pingthread.cpp" />

+    <ClCompile Include="src\rawping.cpp" />

+    <ClCompile Include="src\stdafx.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="src\utils.cpp" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/Ping/ping.vcxproj.filters b/plugins/Ping/ping.vcxproj.filters
index 1e53e1ccad..88f78f08e5 100644
--- a/plugins/Ping/ping.vcxproj.filters
+++ b/plugins/Ping/ping.vcxproj.filters
@@ -15,107 +15,84 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="icmp.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="log.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="menu.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="options.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="ping.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="pinggraph.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="pinglist.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="pingthread.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="rawping.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="utils.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

+    <ResourceCompile Include="res\ping.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="collection.h">

+    <ClInclude Include="src\collection.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="common.h">

+    <ClInclude Include="src\common.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icmp.h">

+    <ClInclude Include="src\icmp.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="log.h">

+    <ClInclude Include="src\log.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="menu.h">

+    <ClInclude Include="src\menu.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

+    <ClInclude Include="src\options.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ping.h">

+    <ClInclude Include="src\ping.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="pinggraph.h">

+    <ClInclude Include="src\pinggraph.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="pinglist.h">

+    <ClInclude Include="src\pinglist.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="pingthread.h">

+    <ClInclude Include="src\pingthread.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="rawping.h">

+    <ClInclude Include="src\rawping.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

+    <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="utils.h">

+    <ClInclude Include="src\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="green.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="grey.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="ico00001.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icon1.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icon2.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="icon3.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="red.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="yellow.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="ping.rc">

-      <Filter>Resource Files</Filter>

-    </ResourceCompile>

+    <ClCompile Include="src\icmp.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\log.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\menu.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ping.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\pinggraph.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\pinglist.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\pingthread.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\rawping.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\utils.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\stdafx.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file