Tox: setup filters

6 files changed, 37 insertions, 7 deletions

diff --git a/protocols/Tox/Tox.vcxproj b/protocols/Tox/Tox.vcxproj
index 45b896c53a..17ed280c21 100644
--- a/protocols/Tox/Tox.vcxproj
+++ b/protocols/Tox/Tox.vcxproj
@@ -33,15 +33,15 @@
       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

-  <ItemGroup>

-    <None Include="res\Icons\*.ico" />

-  </ItemGroup>

   <ItemDefinitionGroup>

     <ClCompile>

       <ExceptionHandling>Sync</ExceptionHandling>

     </ClCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <None Include="res\*.ico" />

+  </ItemGroup>

+  <ItemGroup>

     <ProjectReference Include="..\..\libs\libjson\libjson.vcxproj">

       <Project>{f6a9340e-b8d9-4c75-be30-47dc66d0abc7}</Project>

     </ProjectReference>

diff --git a/protocols/Tox/libtox/libtox.vcxproj.filters b/protocols/Tox/libtox/libtox.vcxproj.filters
index 5a8d37777a..5de63a3ef5 100644
--- a/protocols/Tox/libtox/libtox.vcxproj.filters
+++ b/protocols/Tox/libtox/libtox.vcxproj.filters
@@ -1,4 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" /> 
+  <ItemGroup>
+    <Filter Include="Source Files\toxcore">
+      <UniqueIdentifier>{4c1f54aa-e38e-40ff-af6d-8b1204ea03e7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\toxcore">
+      <UniqueIdentifier>{56ccf548-fd97-42d3-934a-8966cb5d6642}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\toxencryptsave">
+      <UniqueIdentifier>{ced2050e-c17b-43b3-9a79-137d2f3d1ed0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\toxencryptsave">
+      <UniqueIdentifier>{ce3f9bd0-40ed-49f3-8b69-53dc407e8da6}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\toxcore\*.c">
+      <Filter>Source Files\toxcore</Filter>
+    </ClCompile>
+    <ClInclude Include="src\toxcore\*.h">
+      <Filter>Header Files\toxcore</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\toxencryptsave\*.c">
+      <Filter>Source Files\toxencryptsave</Filter>
+    </ClCompile>
+    <ClInclude Include="src\toxencryptsave\*.h">
+      <Filter>Header Files\toxencryptsave</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
 </Project>
diff --git a/protocols/Tox/res/Icons/edit.ico b/protocols/Tox/res/edit.ico
index 6264e76a93..6264e76a93 100644
--- a/protocols/Tox/res/Icons/edit.ico
+++ b/protocols/Tox/res/edit.ico
diff --git a/protocols/Tox/res/Icons/me.ico b/protocols/Tox/res/me.ico
index db58008e47..db58008e47 100644
--- a/protocols/Tox/res/Icons/me.ico
+++ b/protocols/Tox/res/me.ico
diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc
index 8d8a179e4c..741f076104 100644
--- a/protocols/Tox/res/resource.rc
+++ b/protocols/Tox/res/resource.rc
@@ -62,9 +62,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_TOX                 ICON                    "icons\\tox.ico"

-IDI_ME                  ICON                    "icons\\me.ico"

-IDI_EDIT                ICON                    "icons\\edit.ico"

+IDI_TOX                 ICON                    "tox.ico"

+IDI_ME                  ICON                    "me.ico"

+IDI_EDIT                ICON                    "edit.ico"

 

 

 /////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/Tox/res/Icons/tox.ico b/protocols/Tox/res/tox.ico
index 4703564c80..4703564c80 100644
--- a/protocols/Tox/res/Icons/tox.ico
+++ b/protocols/Tox/res/tox.ico