external/argon2/0002-Add-WinARM64-vcxproj-config.patch | 70 ++++++++++++++--- 1 file changed, 60 insertions(+), 10 deletions(-)
New commits: commit 560989ff89eb1a3e91cfcae1cb524ece20463b86 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Apr 18 08:15:31 2024 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Apr 18 11:55:00 2024 +0200 external/argon2: Adapt vcxproj to Debug|ARM64 Change-Id: I3a881c56859d5db36ee13a63aec6926d0e3f2638 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166230 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/argon2/0002-Add-WinARM64-vcxproj-config.patch b/external/argon2/0002-Add-WinARM64-vcxproj-config.patch index 063296dd107c..4a33df9f0d7c 100644 --- a/external/argon2/0002-Add-WinARM64-vcxproj-config.patch +++ b/external/argon2/0002-Add-WinARM64-vcxproj-config.patch @@ -1,10 +1,14 @@ diff -ur argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj --- argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj 2023-12-23 01:00:49.231059537 +0100 +++ argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj 2023-12-23 01:02:40.375527010 +0100 -@@ -13,6 +13,10 @@ +@@ -13,6 +13,14 @@ <Configuration>ReleaseStatic</Configuration> <Platform>x64</Platform> </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|ARM64"> ++ <Configuration>Debug</Configuration> ++ <Platform>AMR64</Platform> ++ </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM64"> + <Configuration>Release</Configuration> + <Platform>AMR64</Platform> @@ -12,10 +16,15 @@ diff -ur argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj argon2/vs2015/Argon <ProjectConfiguration Include="Release|Win32"> <Configuration>Release</Configuration> <Platform>Win32</Platform> -@@ -50,6 +54,12 @@ +@@ -50,6 +54,17 @@ <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration"> ++ <ConfigurationType>DynamicLibrary</ConfigurationType> ++ <UseDebugLibraries>true</UseDebugLibraries> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> @@ -25,20 +34,28 @@ diff -ur argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj argon2/vs2015/Argon <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> -@@ -84,6 +94,9 @@ +@@ -84,6 +94,12 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <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)'=='Debug|AMR64'"> ++ <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|AMR64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> -@@ -107,6 +120,11 @@ +@@ -107,6 +120,16 @@ <IntDir>$(SolutionDir)vs2015uild\$(ProjectName)\</IntDir> <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath> </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> ++ <OutDir>$(SolutionDir)vs2015uild\</OutDir> ++ <IntDir>$(SolutionDir)vs2015uild\$(ProjectName)\</IntDir> ++ <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath> ++ </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> + <OutDir>$(SolutionDir)vs2015uild\</OutDir> + <IntDir>$(SolutionDir)vs2015uild\$(ProjectName)\</IntDir> @@ -47,10 +64,18 @@ diff -ur argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj argon2/vs2015/Argon <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"> <OutDir>$(SolutionDir)vs2015uild\</OutDir> <IntDir>$(SolutionDir)vs2015uild\$(ProjectName)\</IntDir> -@@ -158,6 +176,21 @@ +@@ -158,6 +176,29 @@ <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> ++ <ClCompile> ++ <WarningLevel>Level3</WarningLevel> ++ <Optimization>Disabled</Optimization> ++ <SDLCheck>true</SDLCheck> ++ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ </ClCompile> ++ </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> @@ -90,10 +115,14 @@ Only in argon2/vs2015/Argon2OptDll: Argon2OptDll.vcxproj~ diff -ur argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj --- argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 2023-12-23 01:00:49.231059537 +0100 +++ argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 2023-12-23 01:02:12.518576081 +0100 -@@ -17,6 +17,10 @@ +@@ -17,6 +17,14 @@ <Configuration>Release</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> ++ <ProjectConfiguration Include="Debug|ARM64"> ++ <Configuration>Debug</Configuration> ++ <Platform>ARM64</Platform> ++ </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM64"> + <Configuration>Release</Configuration> + <Platform>ARM64</Platform> @@ -101,10 +130,15 @@ diff -ur argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj argon2/vs2015 <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> -@@ -51,6 +55,12 @@ +@@ -51,6 +55,17 @@ <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration"> ++ <ConfigurationType>Application</ConfigurationType> ++ <UseDebugLibraries>true</UseDebugLibraries> ++ <CharacterSet>MultiByte</CharacterSet> ++ </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> @@ -114,20 +148,28 @@ diff -ur argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj argon2/vs2015 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> -@@ -85,6 +95,9 @@ +@@ -85,6 +95,12 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <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)'=='Debug|ARM64'"> ++ <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|ARM64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> -@@ -108,6 +121,11 @@ +@@ -108,6 +121,16 @@ <OutDir>$(SolutionDir)vs2015uild\</OutDir> <IntDir>$(SolutionDir)vs2015uild\$(ProjectName)\</IntDir> </PropertyGroup> ++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> ++ <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath> ++ <OutDir>$(SolutionDir)vs2015uild\</OutDir> ++ <IntDir>$(SolutionDir)vs2015uild\$(ProjectName)\</IntDir> ++ </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> + <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath> + <OutDir>$(SolutionDir)vs2015uild\</OutDir> @@ -136,13 +178,21 @@ diff -ur argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj argon2/vs2015 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"> <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath> <OutDir>$(SolutionDir)vs2015uild\</OutDir> -@@ -162,6 +180,21 @@ +@@ -162,6 +180,29 @@ <GenerateDebugInformation>true</GenerateDebugInformation> </Link> </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> ++ <Optimization>Disabled</Optimization> ++ <SDLCheck>true</SDLCheck> ++ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ </ClCompile> ++ </ItemDefinitionGroup> ++ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> ++ <ClCompile> ++ <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>false</IntrinsicFunctions>
