fix for broken project file compatibility in VS2019 16.6.0

5 files changed, 410 insertions, 37 deletions

diff --git a/protocols/Tox/Tox.vcxproj b/protocols/Tox/Tox.vcxproj
index 8458a3cb75..41b34e54d3 100644
--- a/protocols/Tox/Tox.vcxproj
+++ b/protocols/Tox/Tox.vcxproj
@@ -25,6 +25,40 @@
   <ImportGroup Label="PropertySheets">

     <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />

   </ImportGroup>

+  <ItemGroup>

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

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </ItemGroup>

   <ItemDefinitionGroup>

     <ClCompile>

       <AdditionalIncludeDirectories>..\..\include;libtox\src\toxcore;libtox\src\toxencryptsave;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

@@ -38,4 +72,8 @@
       <Project>{a21c50cd-28a6-481a-a12b-47189fe66641}</Project>

     </ProjectReference>

   </ItemGroup>

+  <ItemGroup>

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

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

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Tox/Tox.vcxproj.filters b/protocols/Tox/Tox.vcxproj.filters
index bdb573361c..4704670351 100644
--- a/protocols/Tox/Tox.vcxproj.filters
+++ b/protocols/Tox/Tox.vcxproj.filters
@@ -1,18 +1,106 @@
 <?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" /> 

+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

   <ItemGroup>

-    <ClInclude Include="src\*.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClCompile Include="src\*.cpp;src\*.cxx">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ResourceCompile Include="res\*.rc">

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <None Include="res\*.ico;res\*.bmp;res\*.cur">

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

       <Filter>Resource Files</Filter>

-    </None>

+    </ResourceCompile>

   </ItemGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/protocols/Tox/libtox/libtox.vcxproj b/protocols/Tox/libtox/libtox.vcxproj
index a298c22005..1e5fba908b 100644
--- a/protocols/Tox/libtox/libtox.vcxproj
+++ b/protocols/Tox/libtox/libtox.vcxproj
@@ -37,14 +37,114 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\toxcore\*.c">
+    <ClCompile Include="src\toxcore\crypto_core.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="src\toxencryptsave\*.c">
+    <ClCompile Include="src\toxcore\crypto_core_mem.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClInclude Include="src\toxcore\*.h" />
-    <ClInclude Include="src\toxencryptsave*.h" />
+    <ClCompile Include="src\toxcore\DHT.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\friend_connection.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\friend_requests.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\group.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\LAN_discovery.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\list.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\logger.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\Messenger.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\mono_time.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\network.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\net_crypto.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\onion.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\onion_announce.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\onion_client.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\ping.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\ping_array.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\state.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\TCP_client.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\TCP_connection.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\TCP_server.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\tox.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\tox_api.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\util.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\toxencryptsave\toxencryptsave.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClInclude Include="src\toxcore\ccompat.h" />
+    <ClInclude Include="src\toxcore\crypto_core.api.h" />
+    <ClInclude Include="src\toxcore\crypto_core.h" />
+    <ClInclude Include="src\toxcore\DHT.h" />
+    <ClInclude Include="src\toxcore\friend_connection.h" />
+    <ClInclude Include="src\toxcore\friend_requests.h" />
+    <ClInclude Include="src\toxcore\group.h" />
+    <ClInclude Include="src\toxcore\LAN_discovery.api.h" />
+    <ClInclude Include="src\toxcore\LAN_discovery.h" />
+    <ClInclude Include="src\toxcore\list.h" />
+    <ClInclude Include="src\toxcore\logger.h" />
+    <ClInclude Include="src\toxcore\Messenger.h" />
+    <ClInclude Include="src\toxcore\mono_time.h" />
+    <ClInclude Include="src\toxcore\network.h" />
+    <ClInclude Include="src\toxcore\net_crypto.h" />
+    <ClInclude Include="src\toxcore\onion.h" />
+    <ClInclude Include="src\toxcore\onion_announce.h" />
+    <ClInclude Include="src\toxcore\onion_client.h" />
+    <ClInclude Include="src\toxcore\ping.api.h" />
+    <ClInclude Include="src\toxcore\ping.h" />
+    <ClInclude Include="src\toxcore\ping_array.api.h" />
+    <ClInclude Include="src\toxcore\ping_array.h" />
+    <ClInclude Include="src\toxcore\state.h" />
+    <ClInclude Include="src\toxcore\TCP_client.h" />
+    <ClInclude Include="src\toxcore\TCP_connection.h" />
+    <ClInclude Include="src\toxcore\TCP_server.h" />
+    <ClInclude Include="src\toxcore\tox.api.h" />
+    <ClInclude Include="src\toxcore\tox.h" />
+    <ClInclude Include="src\toxcore\tox_private.h" />
+    <ClInclude Include="src\toxcore\util.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\libs\libsodium\libsodium.vcxproj">
diff --git a/protocols/Tox/libtox/libtox.vcxproj.filters b/protocols/Tox/libtox/libtox.vcxproj.filters
index 83f701f1e3..c550a81269 100644
--- a/protocols/Tox/libtox/libtox.vcxproj.filters
+++ b/protocols/Tox/libtox/libtox.vcxproj.filters
@@ -15,34 +15,176 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files\toxcore</Filter>
+    <ClCompile Include="src\toxcore\crypto_core.c">
+      <Filter>Source Files</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 Include="src\toxcore\crypto_core_mem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\DHT.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\friend_connection.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\friend_requests.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\group.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\LAN_discovery.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\list.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\logger.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\Messenger.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\mono_time.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\network.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\net_crypto.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\onion.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\onion_announce.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\onion_client.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\ping.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\ping_array.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\state.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\TCP_client.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\TCP_connection.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\TCP_server.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\tox.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\tox_api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxcore\util.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\toxencryptsave\toxencryptsave.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClInclude Include="src\toxencryptsave\*.h">
-      <Filter>Header Files\toxencryptsave</Filter>
-    </ClInclude>
   </ItemGroup>
-  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
   <ItemGroup>
-    <ClInclude Include="src\*.h">
+    <ClInclude Include="src\toxcore\ccompat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\crypto_core.api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\crypto_core.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\DHT.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\friend_connection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\friend_requests.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\group.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\LAN_discovery.api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\LAN_discovery.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\list.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\Messenger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\mono_time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\network.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\net_crypto.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\onion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\onion_announce.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\onion_client.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\ping.api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\ping.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\ping_array.api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\ping_array.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\state.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\TCP_client.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\TCP_connection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\TCP_server.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\tox.api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\tox.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\tox_private.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\toxcore\util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClCompile Include="src\*.cpp;src\*.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ResourceCompile Include="res\*.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <None Include="res\*.ico;res\*.bmp;res\*.cur">
-      <Filter>Resource Files</Filter>
-    </None>
   </ItemGroup>
-</Project>
+  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+</Project>
\ No newline at end of file
diff --git a/protocols/Tox/proto_tox/Proto_Tox.vcxproj b/protocols/Tox/proto_tox/Proto_Tox.vcxproj
index 6d0059c70f..e9a6ae84c0 100644
--- a/protocols/Tox/proto_tox/Proto_Tox.vcxproj
+++ b/protocols/Tox/proto_tox/Proto_Tox.vcxproj
@@ -25,4 +25,9 @@
   <ImportGroup Label="PropertySheets">

     <Import Project="$(ProjectDir)..\..\..\build\vc.common\icons.props" />

   </ImportGroup>

+  <ItemGroup>

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

+  </ItemGroup>

 </Project>
\ No newline at end of file