Add xdiff.vcxitems

diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
index 6c30e61..c49dee4 100644 (file)
--- a/ALL.vs2017.sln
+++ b/ALL.vs2017.sln
@@ -306,10 +306,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "Externals\crysta
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Manual", "Docs\Manual\Manual.vcxproj", "{E11617CA-2D87-4571-B22A-48C922D9A0F9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdiff", "Externals\xdiff\xdiff.vcxitems", "{68F1D3A1-9DCA-4B3D-B245-F4ACA5F16563}"
+EndProject
 Global
        GlobalSection(SharedMSBuildProjectFiles) = preSolution
+               Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9
                Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9
                Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
+               Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
                Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
        EndGlobalSection
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -795,6 +799,7 @@ Global
                {91ED0FD4-86C9-4D7C-87C1-1B12F04DCAD0} = {860FEA9B-C932-4878-9E76-3DE0241591C2}
                {7515AC3C-389A-44CD-B940-A59DDE5B8AE3} = {6BBF0DEA-C0B8-4B73-B540-3BF8297B49B4}
                {E11617CA-2D87-4571-B22A-48C922D9A0F9} = {2313487A-3891-4F6E-A4F4-13E8DE53D7AC}
+               {68F1D3A1-9DCA-4B3D-B245-F4ACA5F16563} = {CE514278-A13F-4F6A-93EB-5653410AC214}
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081}

diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
index c3963f0..99ebf87 100644 (file)
--- a/ALL.vs2019.sln
+++ b/ALL.vs2019.sln
@@ -306,10 +306,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "Externals\crysta
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Manual", "Docs\Manual\Manual.vcxproj", "{E11617CA-2D87-4571-B22A-48C922D9A0F9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdiff", "Externals\xdiff\xdiff.vcxitems", "{68F1D3A1-9DCA-4B3D-B245-F4ACA5F16563}"
+EndProject
 Global
        GlobalSection(SharedMSBuildProjectFiles) = preSolution
+               Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9
                Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9
                Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
+               Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
                Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
        EndGlobalSection
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -795,6 +799,7 @@ Global
                {91ED0FD4-86C9-4D7C-87C1-1B12F04DCAD0} = {860FEA9B-C932-4878-9E76-3DE0241591C2}
                {7515AC3C-389A-44CD-B940-A59DDE5B8AE3} = {6BBF0DEA-C0B8-4B73-B540-3BF8297B49B4}
                {E11617CA-2D87-4571-B22A-48C922D9A0F9} = {2313487A-3891-4F6E-A4F4-13E8DE53D7AC}
+               {68F1D3A1-9DCA-4B3D-B245-F4ACA5F16563} = {CE514278-A13F-4F6A-93EB-5653410AC214}
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081}

diff --git a/Externals/xdiff/xdiff.vcxitems b/Externals/xdiff/xdiff.vcxitems
new file mode 100644 (file)
index 0000000..4557c62
--- /dev/null
+++ b/Externals/xdiff/xdiff.vcxitems
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <ItemsProjectGuid>{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}</ItemsProjectGuid>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectCapability Include="SourceItemsFromImports" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xdiffi.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xemit.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xhistogram.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xmerge.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xpatience.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xprepare.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xutils.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xdiff.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)xdiffi.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)xemit.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)xinclude.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)xmacros.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)xprepare.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)xtypes.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)xutils.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

diff --git a/Externals/xdiff/xdiff.vcxitems.filters b/Externals/xdiff/xdiff.vcxitems.filters
new file mode 100644 (file)
index 0000000..8637f38
--- /dev/null
+++ b/Externals/xdiff/xdiff.vcxitems.filters
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{2c00c266-962a-48e7-b1e8-1d1c0dee726d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{1f677e42-4da3-42bf-a414-954bd476353e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xdiffi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xemit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xhistogram.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xmerge.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xpatience.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xprepare.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)xutils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xdiff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xdiffi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xemit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xinclude.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xmacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xprepare.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xtypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)xutils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index a55a8eb..af2c924 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -91,6 +91,7 @@
   </ImportGroup>\r
   <ImportGroup Label="Shared">\r
     <Import Project="..\Externals\crystaledit\editlib\editlib.vcxitems" Label="Shared" />\r
+    <Import Project="..\Externals\xdiff\xdiff.vcxitems" Label="Shared" />\r
   </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
@@ -440,27 +441,6 @@
     <ClCompile Include="..\Externals\gtest\src\gtest-all.cc">\r
       <ExcludedFromBuild>true</ExcludedFromBuild>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xdiffi.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xemit.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xhistogram.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xmerge.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xpatience.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xprepare.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xutils.c">\r
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
-    </ClCompile>\r
     <ClCompile Include="7zCommon.cpp">\r
     </ClCompile>\r
     <ClCompile Include="AboutDlg.cpp">\r
@@ -1029,14 +1009,6 @@
     <ClInclude Include="..\Externals\gtest\include\gtest\internal\gtest-port.h">\r
       <ExcludedFromBuild>true</ExcludedFromBuild>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xdiff.h" />\r
-    <ClInclude Include="..\Externals\xdiff\xdiffi.h" />\r
-    <ClInclude Include="..\Externals\xdiff\xemit.h" />\r
-    <ClInclude Include="..\Externals\xdiff\xinclude.h" />\r
-    <ClInclude Include="..\Externals\xdiff\xmacros.h" />\r
-    <ClInclude Include="..\Externals\xdiff\xprepare.h" />\r
-    <ClInclude Include="..\Externals\xdiff\xtypes.h" />\r
-    <ClInclude Include="..\Externals\xdiff\xutils.h" />\r
     <ClInclude Include="..\Version.h" />\r
     <ClInclude Include="7zCommon.h" />\r
     <ClInclude Include="AboutDlg.h" />\r

diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index 2e55408..b0d6e28 100644 (file)
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -89,15 +89,6 @@
     <Filter Include="Compare Engines\Header Files">\r
       <UniqueIdentifier>{e0f6e1ca-9725-4a97-81da-adf12e7a4e42}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="xdiff">\r
-      <UniqueIdentifier>{aaf72b76-2f45-4d7e-9d2a-5692d58cdce4}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="xdiff\Source Files">\r
-      <UniqueIdentifier>{ffdcde37-3059-47f3-b99a-77204a77a641}</UniqueIdentifier>\r
-    </Filter>\r
-    <Filter Include="xdiff\Header Files">\r
-      <UniqueIdentifier>{41bd2806-5584-4fb1-9fa4-350c8a7fb3d4}</UniqueIdentifier>\r
-    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="charsets.c">\r
@@ -637,27 +628,6 @@
     <ClCompile Include="Common\ShellContextMenu.cpp">\r
       <Filter>Common\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xdiffi.c">\r
-      <Filter>xdiff\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xemit.c">\r
-      <Filter>xdiff\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xhistogram.c">\r
-      <Filter>xdiff\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xmerge.c">\r
-      <Filter>xdiff\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xpatience.c">\r
-      <Filter>xdiff\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xprepare.c">\r
-      <Filter>xdiff\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\Externals\xdiff\xutils.c">\r
-      <Filter>xdiff\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="xdiff_gnudiff_compat.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -1278,30 +1248,6 @@
     <ClInclude Include="Common\ShellContextMenu.h">\r
       <Filter>Common\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xdiff.h">\r
-      <Filter>xdiff\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xdiffi.h">\r
-      <Filter>xdiff\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xemit.h">\r
-      <Filter>xdiff\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xinclude.h">\r
-      <Filter>xdiff\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xmacros.h">\r
-      <Filter>xdiff\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xprepare.h">\r
-      <Filter>xdiff\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xtypes.h">\r
-      <Filter>xdiff\Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\Externals\xdiff\xutils.h">\r
-      <Filter>xdiff\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="xdiff_gnudiff_compat.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r

diff --git a/Src/diffutils/src/ED.C b/Src/diffutils/src/ed.c
similarity index 100%
rename from Src/diffutils/src/ED.C
rename to Src/diffutils/src/ed.c

diff --git a/Src/diffutils/src/NORMAL.C b/Src/diffutils/src/normal.c
similarity index 100%
rename from Src/diffutils/src/NORMAL.C
rename to Src/diffutils/src/normal.c

diff --git a/WinMerge.vs2017.sln b/WinMerge.vs2017.sln
index 828019c..75f4412 100644 (file)
--- a/WinMerge.vs2017.sln
+++ b/WinMerge.vs2017.sln
@@ -25,8 +25,10 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files", "{DC3B258E-444F-460D-8FD9-09A8165212FA}"\r
        ProjectSection(SolutionItems) = preProject\r
                BuildAll.vs2017.cmd = BuildAll.vs2017.cmd\r
+               BuildAll.vs2019.cmd = BuildAll.vs2019.cmd\r
                BuildArc.cmd = BuildArc.cmd\r
                BuildBin.vs2017.cmd = BuildBin.vs2017.cmd\r
+               BuildBin.vs2019.cmd = BuildBin.vs2019.cmd\r
                BuildInstaller.cmd = BuildInstaller.cmd\r
                BuildManual.cmd = BuildManual.cmd\r
                SetVersion.cmd = SetVersion.cmd\r
@@ -44,9 +46,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2A835469
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "Externals\crystaledit\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdiff", "Externals\xdiff\xdiff.vcxitems", "{68F1D3A1-9DCA-4B3D-B245-F4ACA5F16563}"\r
+EndProject\r
 Global\r
        GlobalSection(SharedMSBuildProjectFiles) = preSolution\r
+               Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9\r
                Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4\r
+               Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4\r
        EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r

diff --git a/WinMerge.vs2019.sln b/WinMerge.vs2019.sln
index 590aea6..959360e 100644 (file)
--- a/WinMerge.vs2019.sln
+++ b/WinMerge.vs2019.sln
@@ -46,9 +46,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2A835469
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "Externals\crystaledit\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdiff", "Externals\xdiff\xdiff.vcxitems", "{68F1D3A1-9DCA-4B3D-B245-F4ACA5F16563}"
+EndProject
 Global
        GlobalSection(SharedMSBuildProjectFiles) = preSolution
+               Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9
                Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
+               Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4
        EndGlobalSection
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32