From f9a3d5ed4b9e984237e2243c042506e39443250d Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sat, 7 Oct 2023 13:00:49 +0900 Subject: [PATCH] Move the parser source files in editlib.vcxitems to editlibparsers.vcxitems. --- ALL.vs2017.sln | 56 ++--- ALL.vs2019.sln | 8 +- ALL.vs2022.sln | 8 +- .../crystaledit/Sample/SampleStatic.vcxproj | 1 + .../Sample/SampleStatic.vs2017.sln | 12 +- .../Sample/SampleStatic.vs2019.sln | 12 +- .../Sample/SampleStatic.vs2022.sln | 12 +- .../crystaledit/editlib/editlib.vcxitems | 188 ---------------- .../editlib/editlib.vcxitems.filters | 195 ++-------------- .../editlib/editlibparsers.vcxitems | 208 ++++++++++++++++++ .../editlib/editlibparsers.vcxitems.filters | 171 ++++++++++++++ Src/Merge.vcxproj | 3 +- Testing/FolderCompare/FolderCompare.vcxproj | 8 +- .../FolderCompare.vcxproj.filters | 6 - .../FolderCompare/FolderCompare.vs2017.sln | 12 +- WinMerge.vs2017.sln | 4 + WinMerge.vs2019.sln | 4 + WinMerge.vs2022.sln | 4 + 18 files changed, 488 insertions(+), 424 deletions(-) create mode 100644 Externals/crystaledit/editlib/editlibparsers.vcxitems create mode 100644 Externals/crystaledit/editlib/editlibparsers.vcxitems.filters diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln index 94a5a2d6a95..096c4debe3a 100644 --- a/ALL.vs2017.sln +++ b/ALL.vs2017.sln @@ -232,10 +232,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Users", "Users", "{5D37AB3C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manual", "Manual", "{2313487A-3891-4F6E-A4F4-13E8DE53D7AC}" ProjectSection(SolutionItems) = preProject - Docs\Manual\build_html_en.bat = Docs\Manual\build_html_en.bat - Docs\Manual\build_html_jp.bat = Docs\Manual\build_html_jp.bat Docs\Manual\build_htmlhelp_en.bat = Docs\Manual\build_htmlhelp_en.bat Docs\Manual\build_htmlhelp_jp.bat = Docs\Manual\build_htmlhelp_jp.bat + Docs\Manual\build_html_en.bat = Docs\Manual\build_html_en.bat + Docs\Manual\build_html_jp.bat = Docs\Manual\build_html_jp.bat Docs\Manual\configuration.bat = Docs\Manual\configuration.bat Docs\Manual\Manual.cfg = Docs\Manual\Manual.cfg Docs\Manual\README.md = Docs\Manual\README.md @@ -433,30 +433,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlantUML", "PlantUML", "{46 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Plugins\src_VCPP\Common\Common.vcxitems", "{7354BA4F-8DAB-46EE-A5A2-A148D6EF2443}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "Externals\crystaledit\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Plugins\src_VCPP\Common\Common.vcxitems*{098b241d-63af-4683-baf8-6da57fd8fe75}*SharedItemsImports = 4 - Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4 - Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9 - Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9 - Externals\googletest\googletest\googletest.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 - Externals\xdiff\xdiff.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 - Plugins\src_VCPP\Common\Common.vcxitems*{7354ba4f-8dab-46ee-a5a2-a148d6ef2443}*SharedItemsImports = 9 - Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 - Externals\googletest\googletest\googletest.vcxitems*{9ee35458-b145-444f-92b7-27ff72112c42}*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 - Src\CompareEngines\CompareEngines.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 - Src\diffutils\diffutils.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 - Plugins\src_VCPP\Common\Common.vcxitems*{a644fba4-d76e-4500-b4b7-04d7a245359a}*SharedItemsImports = 4 - Plugins\src_VCPP\Common\Common.vcxitems*{aa88b46e-b2e2-4b03-8cd5-1e9d60db6ab2}*SharedItemsImports = 4 - Externals\crystaledit\editlib\editlib.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 - Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 - Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 - Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 - Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 - Src\diffutils\diffutils.vcxitems*{fc3b9df3-2854-4264-ab4b-ee8c43982513}*SharedItemsImports = 9 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 @@ -1384,8 +1363,35 @@ Global {CC5DD45F-61D5-4A43-BBF5-E84509F3F3B6} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0} {460A3D0C-F937-4E82-9F70-C79E158809B4} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0} {7354BA4F-8DAB-46EE-A5A2-A148D6EF2443} = {AA9C3A4D-4CD6-46BE-A266-A5FE7BE52F65} + {4170552A-09E2-4FAC-B71D-0E2F5EB3C869} = {6BBF0DEA-C0B8-4B73-B540-3BF8297B49B4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Plugins\src_VCPP\Common\Common.vcxitems*{098b241d-63af-4683-baf8-6da57fd8fe75}*SharedItemsImports = 4 + Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4 + Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 + Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9 + Externals\googletest\googletest\googletest.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 + Externals\xdiff\xdiff.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 + Plugins\src_VCPP\Common\Common.vcxitems*{7354ba4f-8dab-46ee-a5a2-a148d6ef2443}*SharedItemsImports = 9 + Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 + Externals\googletest\googletest\googletest.vcxitems*{9ee35458-b145-444f-92b7-27ff72112c42}*SharedItemsImports = 9 + Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Src\CompareEngines\CompareEngines.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Src\diffutils\diffutils.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Plugins\src_VCPP\Common\Common.vcxitems*{a644fba4-d76e-4500-b4b7-04d7a245359a}*SharedItemsImports = 4 + Plugins\src_VCPP\Common\Common.vcxitems*{aa88b46e-b2e2-4b03-8cd5-1e9d60db6ab2}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + Src\diffutils\diffutils.vcxitems*{fc3b9df3-2854-4264-ab4b-ee8c43982513}*SharedItemsImports = 9 + EndGlobalSection EndGlobal diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln index 85efd21483e..d15eab89136 100644 --- a/ALL.vs2019.sln +++ b/ALL.vs2019.sln @@ -444,6 +444,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlantUML", "PlantUML", "{46 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Plugins\src_VCPP\Common\Common.vcxitems", "{7354BA4F-8DAB-46EE-A5A2-A148D6EF2443}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "Externals\crystaledit\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -1430,6 +1432,7 @@ Global {CC5DD45F-61D5-4A43-BBF5-E84509F3F3B6} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0} {460A3D0C-F937-4E82-9F70-C79E158809B4} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0} {7354BA4F-8DAB-46EE-A5A2-A148D6EF2443} = {AA9C3A4D-4CD6-46BE-A266-A5FE7BE52F65} + {4170552A-09E2-4FAC-B71D-0E2F5EB3C869} = {6BBF0DEA-C0B8-4B73-B540-3BF8297B49B4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081} @@ -1438,6 +1441,7 @@ Global Plugins\src_VCPP\Common\Common.vcxitems*{098b241d-63af-4683-baf8-6da57fd8fe75}*SharedItemsImports = 4 Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 @@ -1445,16 +1449,18 @@ Global Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{9ee35458-b145-444f-92b7-27ff72112c42}*SharedItemsImports = 9 Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Plugins\src_VCPP\Common\Common.vcxitems*{a644fba4-d76e-4500-b4b7-04d7a245359a}*SharedItemsImports = 4 Plugins\src_VCPP\Common\Common.vcxitems*{aa88b46e-b2e2-4b03-8cd5-1e9d60db6ab2}*SharedItemsImports = 4 - Externals\crystaledit\editlib\editlib.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{fc3b9df3-2854-4264-ab4b-ee8c43982513}*SharedItemsImports = 9 EndGlobalSection EndGlobal diff --git a/ALL.vs2022.sln b/ALL.vs2022.sln index 69f99217dda..a29b0370c0f 100644 --- a/ALL.vs2022.sln +++ b/ALL.vs2022.sln @@ -444,6 +444,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlantUML", "PlantUML", "{46 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Plugins\src_VCPP\Common\Common.vcxitems", "{7354BA4F-8DAB-46EE-A5A2-A148D6EF2443}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "Externals\crystaledit\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -1430,6 +1432,7 @@ Global {CC5DD45F-61D5-4A43-BBF5-E84509F3F3B6} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0} {460A3D0C-F937-4E82-9F70-C79E158809B4} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0} {7354BA4F-8DAB-46EE-A5A2-A148D6EF2443} = {AA9C3A4D-4CD6-46BE-A266-A5FE7BE52F65} + {4170552A-09E2-4FAC-B71D-0E2F5EB3C869} = {6BBF0DEA-C0B8-4B73-B540-3BF8297B49B4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081} @@ -1438,6 +1441,7 @@ Global Plugins\src_VCPP\Common\Common.vcxitems*{098b241d-63af-4683-baf8-6da57fd8fe75}*SharedItemsImports = 4 Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 @@ -1445,16 +1449,18 @@ Global Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{9ee35458-b145-444f-92b7-27ff72112c42}*SharedItemsImports = 9 Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Plugins\src_VCPP\Common\Common.vcxitems*{a644fba4-d76e-4500-b4b7-04d7a245359a}*SharedItemsImports = 4 Plugins\src_VCPP\Common\Common.vcxitems*{aa88b46e-b2e2-4b03-8cd5-1e9d60db6ab2}*SharedItemsImports = 4 - Externals\crystaledit\editlib\editlib.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{fc3b9df3-2854-4264-ab4b-ee8c43982513}*SharedItemsImports = 9 EndGlobalSection EndGlobal diff --git a/Externals/crystaledit/Sample/SampleStatic.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vcxproj index d7739691772..3ff2e1691e4 100644 --- a/Externals/crystaledit/Sample/SampleStatic.vcxproj +++ b/Externals/crystaledit/Sample/SampleStatic.vcxproj @@ -118,6 +118,7 @@ + diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.sln b/Externals/crystaledit/Sample/SampleStatic.vs2017.sln index a4cdac36e7c..e224301e51f 100644 --- a/Externals/crystaledit/Sample/SampleStatic.vs2017.sln +++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.sln @@ -10,11 +10,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "..\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "..\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 - ..\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 @@ -81,4 +79,10 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D875F13-7AF3-4BE0-B667-DD8052CBF835} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 + ..\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 + ..\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + ..\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + EndGlobalSection EndGlobal diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.sln b/Externals/crystaledit/Sample/SampleStatic.vs2019.sln index 81bfdcea0f0..89ea4994c1a 100644 --- a/Externals/crystaledit/Sample/SampleStatic.vs2019.sln +++ b/Externals/crystaledit/Sample/SampleStatic.vs2019.sln @@ -11,11 +11,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "..\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "..\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 - ..\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 @@ -82,4 +80,10 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D875F13-7AF3-4BE0-B667-DD8052CBF835} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 + ..\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 + ..\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + ..\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + EndGlobalSection EndGlobal diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2022.sln b/Externals/crystaledit/Sample/SampleStatic.vs2022.sln index 89ca1d291f0..82960fda201 100644 --- a/Externals/crystaledit/Sample/SampleStatic.vs2022.sln +++ b/Externals/crystaledit/Sample/SampleStatic.vs2022.sln @@ -11,11 +11,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlib", "..\editlib\editlib.vcxitems", "{7515AC3C-389A-44CD-B940-A59DDE5B8AE3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "..\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 - ..\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 @@ -82,4 +80,10 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D875F13-7AF3-4BE0-B667-DD8052CBF835} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 + ..\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 + ..\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + ..\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4 + EndGlobalSection EndGlobal diff --git a/Externals/crystaledit/editlib/editlib.vcxitems b/Externals/crystaledit/editlib/editlib.vcxitems index 28db73929e3..358117cb4ed 100644 --- a/Externals/crystaledit/editlib/editlib.vcxitems +++ b/Externals/crystaledit/editlib/editlib.vcxitems @@ -33,186 +33,6 @@ pch.h $(IntDir)$(TargetName)2.pch - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - - - pch.h - $(IntDir)$(TargetName)2.pch - NotUsing @@ -229,13 +49,8 @@ - - - pch.h - $(IntDir)$(TargetName)2.pch - pch.h @@ -249,7 +64,6 @@ - @@ -273,10 +87,8 @@ - - diff --git a/Externals/crystaledit/editlib/editlib.vcxitems.filters b/Externals/crystaledit/editlib/editlib.vcxitems.filters index d1eb0bbde8c..8c1dd183b4b 100644 --- a/Externals/crystaledit/editlib/editlib.vcxitems.filters +++ b/Externals/crystaledit/editlib/editlib.vcxitems.filters @@ -10,15 +10,6 @@ {140ff583-705c-43c8-9970-86fe11cd2513} - - {2497dcf8-8599-4ee1-bdfd-7bf45135fe7b} - - - {d7a55908-11e7-4998-8fa3-58edccce8271} - - - {25298fd9-8651-4619-a2bb-937549116f40} - {3fe0d48d-7410-4c0b-83dc-0c1d7a146ea9} @@ -63,138 +54,6 @@ Source Files - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - - - Parsers\Source Files - Utils @@ -207,15 +66,9 @@ Utils - - Utils - Utils - - Utils - Utils @@ -246,9 +99,6 @@ Utils - - Parsers\Source Files - @@ -297,33 +147,6 @@ Header Files - - Parsers\Header Files - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - - - Utils - Renderers @@ -360,6 +183,24 @@ Header Files + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + \ No newline at end of file diff --git a/Externals/crystaledit/editlib/editlibparsers.vcxitems b/Externals/crystaledit/editlib/editlibparsers.vcxitems new file mode 100644 index 00000000000..13657c24fd3 --- /dev/null +++ b/Externals/crystaledit/editlib/editlibparsers.vcxitems @@ -0,0 +1,208 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {4170552A-09E2-4FAC-B71D-0E2F5EB3C869} + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + pch.h + $(IntDir)$(TargetName)2.pch + + + + pch.h + $(IntDir)$(TargetName)2.pch + + + + + + + + \ No newline at end of file diff --git a/Externals/crystaledit/editlib/editlibparsers.vcxitems.filters b/Externals/crystaledit/editlib/editlibparsers.vcxitems.filters new file mode 100644 index 00000000000..9f172614a86 --- /dev/null +++ b/Externals/crystaledit/editlib/editlibparsers.vcxitems.filters @@ -0,0 +1,171 @@ + + + + + {851f47a6-029e-4270-ae4b-0934e924e6ac} + + + {3497dcf8-8599-4ee1-bdfd-7bf45135fe7b} + + + {e7a55908-11e7-4998-8fa3-58edccce8271} + + + {35298fd9-8651-4619-a2bb-937549116f40} + + + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Parsers\Source Files + + + Utils + + + Parsers\Source Files + + + Utils + + + + + Parsers\Header Files + + + Utils + + + Utils + + + \ No newline at end of file diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj index 1e133689876..394db371425 100644 --- a/Src/Merge.vcxproj +++ b/Src/Merge.vcxproj @@ -180,6 +180,7 @@ + @@ -1822,4 +1823,4 @@ - \ No newline at end of file + diff --git a/Testing/FolderCompare/FolderCompare.vcxproj b/Testing/FolderCompare/FolderCompare.vcxproj index 91cba19463c..8901e2d0b82 100644 --- a/Testing/FolderCompare/FolderCompare.vcxproj +++ b/Testing/FolderCompare/FolderCompare.vcxproj @@ -124,8 +124,8 @@ - + @@ -738,11 +738,6 @@ pch.h $(IntDir)$(TargetName)2.pch - - Use - pch.h - $(IntDir)$(TargetName)2.pch - Use pch.h @@ -856,7 +851,6 @@ - diff --git a/Testing/FolderCompare/FolderCompare.vcxproj.filters b/Testing/FolderCompare/FolderCompare.vcxproj.filters index 96801f0e8ef..cd8f6afaa42 100644 --- a/Testing/FolderCompare/FolderCompare.vcxproj.filters +++ b/Testing/FolderCompare/FolderCompare.vcxproj.filters @@ -159,9 +159,6 @@ Source Files - - Source Files - Source Files @@ -326,9 +323,6 @@ Header Files - - Header Files - Header Files diff --git a/Testing/FolderCompare/FolderCompare.vs2017.sln b/Testing/FolderCompare/FolderCompare.vs2017.sln index 60d0dc30d0b..14854b2fefa 100644 --- a/Testing/FolderCompare/FolderCompare.vs2017.sln +++ b/Testing/FolderCompare/FolderCompare.vs2017.sln @@ -5,12 +5,6 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FolderCompare", "FolderCompare.vcxproj", "{AB827C6B-5116-408F-B453-E2075E9B73B4}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\Externals\crystaledit\editlib\editlib.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 - ..\..\Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 - ..\..\Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 - ..\..\Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 @@ -45,4 +39,10 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {F92C5E78-5746-460F-8B51-142B87DE221F} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\..\Externals\crystaledit\editlib\editlibparsers.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + ..\..\Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + ..\..\Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + ..\..\Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4 + EndGlobalSection EndGlobal diff --git a/WinMerge.vs2017.sln b/WinMerge.vs2017.sln index 741f6dfbb86..fb8db1162dc 100644 --- a/WinMerge.vs2017.sln +++ b/WinMerge.vs2017.sln @@ -56,16 +56,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompareEngines", "Src\Compa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googletest", "Externals\googletest\googletest\googletest.vcxitems", "{9EE35458-B145-444F-92B7-27FF72112C42}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "Externals\crystaledit\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{9ee35458-b145-444f-92b7-27ff72112c42}*SharedItemsImports = 9 Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 diff --git a/WinMerge.vs2019.sln b/WinMerge.vs2019.sln index f94e6465ae6..86538ab1761 100644 --- a/WinMerge.vs2019.sln +++ b/WinMerge.vs2019.sln @@ -56,16 +56,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompareEngines", "Src\Compa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googletest", "Externals\googletest\googletest\googletest.vcxitems", "{9EE35458-B145-444F-92B7-27FF72112C42}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "Externals\crystaledit\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{9ee35458-b145-444f-92b7-27ff72112c42}*SharedItemsImports = 9 Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 diff --git a/WinMerge.vs2022.sln b/WinMerge.vs2022.sln index 7996e2a5500..47905a01d22 100644 --- a/WinMerge.vs2022.sln +++ b/WinMerge.vs2022.sln @@ -56,16 +56,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompareEngines", "Src\Compa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googletest", "Externals\googletest\googletest\googletest.vcxitems", "{9EE35458-B145-444F-92B7-27FF72112C42}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editlibparsers", "Externals\crystaledit\editlib\editlibparsers.vcxitems", "{4170552A-09E2-4FAC-B71D-0E2F5EB3C869}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9 Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{733e7c0b-ac3d-47ac-a8da-e13644d6294d}*SharedItemsImports = 4 Externals\crystaledit\editlib\editlib.vcxitems*{7515ac3c-389a-44cd-b940-a59dde5b8ae3}*SharedItemsImports = 9 Externals\googletest\googletest\googletest.vcxitems*{9ee35458-b145-444f-92b7-27ff72112c42}*SharedItemsImports = 9 Externals\crystaledit\editlib\editlib.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 + Externals\crystaledit\editlib\editlibparsers.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Externals\xdiff\xdiff.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\CompareEngines\CompareEngines.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4 Src\diffutils\diffutils.vcxitems*{9fda4af0-ccfd-4812-bdb9-53efedb32bde}*SharedItemsImports = 4