Add ARM platform

flaviu22 · Dec 10, 2021 · c57eb6d · c57eb6d
1 parent ab9e734
commit c57eb6d
Show file tree

Hide file tree

Showing 52 changed files with 4,046 additions and 257 deletions.
diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
diff --git a/ALL.vs2022.sln b/ALL.vs2022.sln
diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vcxproj
diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2017.sln b/ArchiveSupport/Merge7z/Merge7z.vs2017.sln
@@ -6,20 +6,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z", "Merge7z.vcxproj"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2019.sln b/ArchiveSupport/Merge7z/Merge7z.vs2019.sln
@@ -6,20 +6,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z", "Merge7z.vcxproj"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2022.sln b/ArchiveSupport/Merge7z/Merge7z.vs2022.sln
@@ -1,25 +1,32 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z", "Merge7z.vcxproj", "{FFB6D02A-782B-48EF-8398-7F8862859616}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/BuildArc.cmd b/BuildArc.cmd
@@ -90,11 +90,19 @@ if not "%1" == "" (
 
 rem ShellExtension
 echo Copy ShellExtension...
-if not "%1" == "ARM64" (
+if "%1" == "" (
+  copy "Build\ShellExtension\ShellExtensionU.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL
+  copy "Build\ShellExtension\ShellExtensionX64.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL
+  copy "Build\ShellExtension\x64\WinMergeContextMenu.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL
+)
+if "%1" == "x64" (
   copy "Build\ShellExtension\ShellExtensionU.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL
   copy "Build\ShellExtension\ShellExtensionX64.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL
   copy "Build\ShellExtension\x64\WinMergeContextMenu.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL
 )
+if "%1" == "ARM" (
+  copy "Build\ShellExtension\ShellExtensionARM.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL
+)
 if "%1" == "ARM64" (
   copy "Build\ShellExtension\ShellExtensionARM64.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL
   copy "Build\ShellExtension\ARM64\WinMergeContextMenu.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL

diff --git a/Docs/Manual/Manual.vcxproj b/Docs/Manual/Manual.vcxproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|ARM64">
       <Configuration>Release</Configuration>
       <Platform>ARM64</Platform>
@@ -69,6 +77,14 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '17'">v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '17'">v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -87,6 +103,15 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16'">v142</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '17'">v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -103,12 +128,18 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -151,6 +182,14 @@
     <NMakeCleanCommandLine>build_htmlhelp_en.bat /clean &amp; build_htmlhelp_jp.bat /clean</NMakeCleanCommandLine>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <TargetName>WinMerge.chm</TargetName>
+    <NMakeOutput />
+    <NMakeBuildCommandLine>build_htmlhelp_en.bat /build &amp; build_htmlhelp_jp.bat /build</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>build_htmlhelp_en.bat &amp; build_htmlhelp_jp.bat</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>build_htmlhelp_en.bat /clean &amp; build_htmlhelp_jp.bat /clean</NMakeCleanCommandLine>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\Build\Manual\htmlhelp</OutDir>
@@ -170,6 +209,14 @@
     <NMakeCleanCommandLine>build_htmlhelp_en.bat /clean &amp; build_htmlhelp_jp.bat /clean</NMakeCleanCommandLine>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <TargetName>WinMerge.chm</TargetName>
+    <NMakeOutput />
+    <NMakeBuildCommandLine>build_htmlhelp_en.bat /build &amp; build_htmlhelp_jp.bat /build</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>build_htmlhelp_en.bat &amp; build_htmlhelp_jp.bat</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>build_htmlhelp_en.bat /clean &amp; build_htmlhelp_jp.bat /clean</NMakeCleanCommandLine>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -222,6 +269,18 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -254,6 +313,22 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <Xml Include="EN\About_Doc.xml" />
     <Xml Include="EN\Command_line.xml" />
@@ -472,4 +547,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>