Bump version to 24.04.3.4
[LibreOffice.git] / external / argon2 / 0002-Add-WinARM64-vcxproj-config.patch
blob063296dd107c607f7d1f9264e3608e0b692f7c21
1 diff -ur argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj
2 --- argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj 2023-12-23 01:00:49.231059537 +0100
3 +++ argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj 2023-12-23 01:02:40.375527010 +0100
4 @@ -13,6 +13,10 @@
5 <Configuration>ReleaseStatic</Configuration>
6 <Platform>x64</Platform>
7 </ProjectConfiguration>
8 + <ProjectConfiguration Include="Release|ARM64">
9 + <Configuration>Release</Configuration>
10 + <Platform>AMR64</Platform>
11 + </ProjectConfiguration>
12 <ProjectConfiguration Include="Release|Win32">
13 <Configuration>Release</Configuration>
14 <Platform>Win32</Platform>
15 @@ -50,6 +54,12 @@
16 <WholeProgramOptimization>true</WholeProgramOptimization>
17 <CharacterSet>MultiByte</CharacterSet>
18 </PropertyGroup>
19 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
20 + <ConfigurationType>DynamicLibrary</ConfigurationType>
21 + <UseDebugLibraries>false</UseDebugLibraries>
22 + <WholeProgramOptimization>true</WholeProgramOptimization>
23 + <CharacterSet>MultiByte</CharacterSet>
24 + </PropertyGroup>
25 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
26 <ConfigurationType>DynamicLibrary</ConfigurationType>
27 <UseDebugLibraries>false</UseDebugLibraries>
28 @@ -84,6 +94,9 @@
29 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
30 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
31 </ImportGroup>
32 + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|AMR64'">
33 + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
34 + </ImportGroup>
35 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="PropertySheets">
36 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
37 </ImportGroup>
38 @@ -107,6 +120,11 @@
39 <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
40 <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
41 </PropertyGroup>
42 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
43 + <OutDir>$(SolutionDir)vs2015\build\</OutDir>
44 + <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
45 + <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
46 + </PropertyGroup>
47 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
48 <OutDir>$(SolutionDir)vs2015\build\</OutDir>
49 <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
50 @@ -158,6 +176,21 @@
51 <GenerateDebugInformation>true</GenerateDebugInformation>
52 </Link>
53 </ItemDefinitionGroup>
54 + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
55 + <ClCompile>
56 + <WarningLevel>Level3</WarningLevel>
57 + <Optimization>MaxSpeed</Optimization>
58 + <FunctionLevelLinking>true</FunctionLevelLinking>
59 + <IntrinsicFunctions>false</IntrinsicFunctions>
60 + <SDLCheck>true</SDLCheck>
61 + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
62 + </ClCompile>
63 + <Link>
64 + <EnableCOMDATFolding>true</EnableCOMDATFolding>
65 + <OptimizeReferences>true</OptimizeReferences>
66 + <GenerateDebugInformation>true</GenerateDebugInformation>
67 + </Link>
68 + </ItemDefinitionGroup>
69 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
70 <ClCompile>
71 <WarningLevel>Level3</WarningLevel>
72 @@ -209,7 +242,6 @@
73 <ClInclude Include="..\..\include\argon2.h" />
74 <ClInclude Include="..\..\src\blake2\blake2-impl.h" />
75 <ClInclude Include="..\..\src\blake2\blake2.h" />
76 - <ClInclude Include="..\..\src\blake2\blamka-round-opt.h" />
77 <ClInclude Include="..\..\src\blake2\blamka-round-ref.h" />
78 <ClInclude Include="..\..\src\core.h" />
79 <ClInclude Include="..\..\src\encoding.h" />
80 @@ -221,7 +253,7 @@
81 <ClCompile Include="..\..\src\blake2\blake2b.c" />
82 <ClCompile Include="..\..\src\core.c" />
83 <ClCompile Include="..\..\src\encoding.c" />
84 - <ClCompile Include="..\..\src\opt.c" />
85 + <ClCompile Include="..\..\src\ref.c" />
86 <ClCompile Include="..\..\src\thread.c" />
87 </ItemGroup>
88 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
89 Only in argon2/vs2015/Argon2OptDll: Argon2OptDll.vcxproj~
90 diff -ur argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj
91 --- argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 2023-12-23 01:00:49.231059537 +0100
92 +++ argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 2023-12-23 01:02:12.518576081 +0100
93 @@ -17,6 +17,10 @@
94 <Configuration>Release</Configuration>
95 <Platform>Win32</Platform>
96 </ProjectConfiguration>
97 + <ProjectConfiguration Include="Release|ARM64">
98 + <Configuration>Release</Configuration>
99 + <Platform>ARM64</Platform>
100 + </ProjectConfiguration>
101 <ProjectConfiguration Include="Debug|x64">
102 <Configuration>Debug</Configuration>
103 <Platform>x64</Platform>
104 @@ -51,6 +55,12 @@
105 <WholeProgramOptimization>true</WholeProgramOptimization>
106 <CharacterSet>MultiByte</CharacterSet>
107 </PropertyGroup>
108 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
109 + <ConfigurationType>Application</ConfigurationType>
110 + <UseDebugLibraries>false</UseDebugLibraries>
111 + <WholeProgramOptimization>true</WholeProgramOptimization>
112 + <CharacterSet>MultiByte</CharacterSet>
113 + </PropertyGroup>
114 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="Configuration">
115 <ConfigurationType>Application</ConfigurationType>
116 <UseDebugLibraries>false</UseDebugLibraries>
117 @@ -85,6 +95,9 @@
118 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
119 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
120 </ImportGroup>
121 + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
122 + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
123 + </ImportGroup>
124 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'" Label="PropertySheets">
125 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
126 </ImportGroup>
127 @@ -108,6 +121,11 @@
128 <OutDir>$(SolutionDir)vs2015\build\</OutDir>
129 <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
130 </PropertyGroup>
131 + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
132 + <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
133 + <OutDir>$(SolutionDir)vs2015\build\</OutDir>
134 + <IntDir>$(SolutionDir)vs2015\build\$(ProjectName)\</IntDir>
135 + </PropertyGroup>
136 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
137 <IncludePath>$(SolutionDir)include;$(IncludePath)</IncludePath>
138 <OutDir>$(SolutionDir)vs2015\build\</OutDir>
139 @@ -162,6 +180,21 @@
140 <GenerateDebugInformation>true</GenerateDebugInformation>
141 </Link>
142 </ItemDefinitionGroup>
143 + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
144 + <ClCompile>
145 + <WarningLevel>Level3</WarningLevel>
146 + <Optimization>MaxSpeed</Optimization>
147 + <FunctionLevelLinking>true</FunctionLevelLinking>
148 + <IntrinsicFunctions>false</IntrinsicFunctions>
149 + <SDLCheck>true</SDLCheck>
150 + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
151 + </ClCompile>
152 + <Link>
153 + <EnableCOMDATFolding>true</EnableCOMDATFolding>
154 + <OptimizeReferences>true</OptimizeReferences>
155 + <GenerateDebugInformation>true</GenerateDebugInformation>
156 + </Link>
157 + </ItemDefinitionGroup>
158 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
159 <ClCompile>
160 <WarningLevel>Level3</WarningLevel>
161 @@ -214,7 +247,7 @@
162 <ClCompile Include="..\..\src\blake2\blake2b.c" />
163 <ClCompile Include="..\..\src\core.c" />
164 <ClCompile Include="..\..\src\encoding.c" />
165 - <ClCompile Include="..\..\src\opt.c" />
166 + <ClCompile Include="..\..\src\ref.c" />
167 <ClCompile Include="..\..\src\test.c" />
168 <ClCompile Include="..\..\src\thread.c" />
169 </ItemGroup>
170 @@ -222,7 +255,6 @@
171 <ClInclude Include="..\..\include\argon2.h" />
172 <ClInclude Include="..\..\src\blake2\blake2-impl.h" />
173 <ClInclude Include="..\..\src\blake2\blake2.h" />
174 - <ClInclude Include="..\..\src\blake2\blamka-round-opt.h" />
175 <ClInclude Include="..\..\src\blake2\blamka-round-ref.h" />
176 <ClInclude Include="..\..\src\core.h" />
177 <ClInclude Include="..\..\src\encoding.h" />
178 @@ -232,4 +264,4 @@
179 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
180 <ImportGroup Label="ExtensionTargets">
181 </ImportGroup>
182 -</Project>
183 \ No newline at end of file
184 +</Project>
185 Only in argon2/vs2015/Argon2OptTestCI: Argon2OptTestCI.vcxproj~