FolderCompare.vcxproj: Remove MFC dependencies

WinMerge · Oct 7, 2023 · 7d16fc7 · 7d16fc7
1 parent 112c6fb
commit 7d16fc7
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 201 deletions.
diff --git a/Externals/crystaledit/editlib/editlibparsers.vcxitems b/Externals/crystaledit/editlib/editlibparsers.vcxitems
@@ -194,7 +194,10 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)utils\fpattern.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)utils\fpattern.cpp">
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)utils\string_util.cpp">
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>

diff --git a/Externals/crystaledit/editlib/utils/fpattern.cpp b/Externals/crystaledit/editlib/utils/fpattern.cpp
@@ -14,7 +14,7 @@
 //  - LEAVE THIS HEADER INTACT
 ////////////////////////////////////////////////////////////////////////////
 
-#include "StdAfx.h"
+#include "pch.h"
 #include "fpattern.h"
 
 #if TEST

diff --git a/Src/Common/LanguageSelect.h b/Src/Common/LanguageSelect.h
@@ -8,10 +8,13 @@
 #include <vector>
 #include <string>
 #include <map>
+#include "UnicodeString.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CLanguageSelect class
 
+class CStatusBar;
+
 /**
  * @brief Class for selecting GUI language.
  *

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
@@ -1417,7 +1417,10 @@
     <ClCompile Include="WildcardDropList.cpp" />
     <ClCompile Include="WindowsManagerDialog.cpp" />
     <ClCompile Include="WMGotoDlg.cpp" />
-    <ClCompile Include="MergeAppCOMClass.cpp" />
+    <ClCompile Include="MergeAppCOMClass.cpp">
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
+    </ClCompile>
     <ClCompile Include="xdiff_gnudiff_compat.cpp">
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)2.pch</PrecompiledHeaderOutputFile>
@@ -1441,6 +1444,7 @@
     <ClInclude Include="AboutDlg.h" />
     <ClInclude Include="ClipboardHistory.h" />
     <ClInclude Include="Common\cio.h" />
+    <ClInclude Include="Common\DebugNew.h" />
     <ClInclude Include="Common\IniOptionsMgr.h" />
     <ClInclude Include="Common\IMDITab.h" />
     <ClInclude Include="Common\Shell.h" />
@@ -1823,4 +1827,4 @@
       <UserProperties RESOURCE_FILE="Merge.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
@@ -1368,6 +1368,9 @@
     <ClInclude Include="IDirDoc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Common\DebugNew.h">
+      <Filter>Common\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\binarydiff.ico">

diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp
@@ -1,4 +1,5 @@
-#include "StdAfx.h"
+#include "pch.h"
+#include <Windows.h>
 #include "MergeAppCOMClass.h"
 #include "LanguageSelect.h"
 #include "OptionsMgr.h"

diff --git a/Testing/FolderCompare/FolderCompare.vcxproj b/Testing/FolderCompare/FolderCompare.vcxproj
diff --git a/Testing/FolderCompare/FolderCompare.vcxproj.filters b/Testing/FolderCompare/FolderCompare.vcxproj.filters
@@ -162,9 +162,6 @@
     <ClCompile Include="..\..\Src\SubstitutionList.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="StdAfx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Src\HashCalc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -332,9 +329,6 @@
     <ClInclude Include="..\..\Src\charsets.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Src\HashCalc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -347,5 +341,8 @@
     <ClInclude Include="..\..\Src\MergeAppCOMClass.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="DebugNew.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Testing/FolderCompare/StdAfx.cpp b/Testing/FolderCompare/StdAfx.cpp
diff --git a/Testing/FolderCompare/StdAfx.h b/Testing/FolderCompare/StdAfx.h