fix for broken project file compatibility in VS2019 16.6.0

2 files changed, 233 insertions, 7 deletions

diff --git a/plugins/Popup/Popup.vcxproj b/plugins/Popup/Popup.vcxproj
index 7413813a34..6677f5e0a5 100644
--- a/plugins/Popup/Popup.vcxproj
+++ b/plugins/Popup/Popup.vcxproj
@@ -30,6 +30,69 @@
   <ImportGroup Label="PropertySheets">

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

   </ImportGroup>

+  <ItemGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+  </ItemGroup>

+  <ItemGroup>

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

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

+  </ItemGroup>

   <ItemDefinitionGroup>

     <ClCompile>

       <DisableSpecificWarnings>4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>

diff --git a/plugins/Popup/Popup.vcxproj.filters b/plugins/Popup/Popup.vcxproj.filters
index 902edc4d65..42e9018814 100644
--- a/plugins/Popup/Popup.vcxproj.filters
+++ b/plugins/Popup/Popup.vcxproj.filters
@@ -2,17 +2,180 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <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\actions.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

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

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\stdafx.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>
\ No newline at end of file