Skip to content

Commit f8fc31e

Browse files
douzzerdouzzer
authored
Merge pull request #8090 from gojimmypi/pr-visual-studio-2022
Add Visual Studio 2022 Project Files for wolfSSL, Test, & Benchmark
2 parents 805eaa9 + ee24446 commit f8fc31e

File tree

11 files changed

+1098
-0
lines changed

11 files changed

+1098
-0
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ctaocrypt/src/src/
1010
*.cache
1111
.dirstamp
1212
*.user
13+
!*-VS2022.vcxproj.user
1314
configure
1415
config.*
1516
!cmake/config.in

‎Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ ACLOCAL_AMFLAGS= -I m4
141141
EXTRA_DIST+= .cyignore
142142
EXTRA_DIST+= wolfssl.vcproj
143143
EXTRA_DIST+= wolfssl.vcxproj
144+
EXTRA_DIST+= wolfssl-VS2022.vcxproj
144145
EXTRA_DIST+= wolfssl64.sln
145146
EXTRA_DIST+= valgrind-error.sh
146147
EXTRA_DIST+= valgrind-bash.supp

‎wolfcrypt/benchmark/benchmark-VS2022.sln‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.11.35327.3
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{60CBE13D-37D2-4754-A1DE-788003549EDA}") = "benchmark-VS2022", "benchmark-VS2022.vcxproj", "{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settings", "settings", "{0D4D8E54-F32D-4056-A415-2362A55972FD}"
9+
ProjectSection(SolutionItems) = preProject
10+
..\..\wolfssl\wolfcrypt\settings.h = ..\..\wolfssl\wolfcrypt\settings.h
11+
..\..\IDE\WIN\user_settings.h = ..\..\IDE\WIN\user_settings.h
12+
EndProjectSection
13+
EndProject
14+
Project("{60CBE13D-37D2-4754-A1DE-788003549EDA}") = "wolfssl-VS2022", "..\..\wolfssl-VS2022.vcxproj", "{12226DBE-7278-4DFA-A119-5A0294CF0B33}"
15+
EndProject
16+
Global
17+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18+
Debug|ARM64 = Debug|ARM64
19+
Debug|x64 = Debug|x64
20+
Debug|x86 = Debug|x86
21+
DLL Debug|ARM64 = DLL Debug|ARM64
22+
DLL Debug|x64 = DLL Debug|x64
23+
DLL Debug|x86 = DLL Debug|x86
24+
DLL Release|ARM64 = DLL Release|ARM64
25+
DLL Release|x64 = DLL Release|x64
26+
DLL Release|x86 = DLL Release|x86
27+
Release|ARM64 = Release|ARM64
28+
Release|x64 = Release|x64
29+
Release|x86 = Release|x86
30+
EndGlobalSection
31+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
32+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|ARM64.ActiveCfg = Debug|x64
33+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|ARM64.Build.0 = Debug|x64
34+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|x64.ActiveCfg = Debug|x64
35+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|x64.Build.0 = Debug|x64
36+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|x86.ActiveCfg = Debug|Win32
37+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Debug|x86.Build.0 = Debug|Win32
38+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|ARM64.ActiveCfg = Debug|x64
39+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|ARM64.Build.0 = Debug|x64
40+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|x64.ActiveCfg = Debug|x64
41+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|x64.Build.0 = Debug|x64
42+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|x86.ActiveCfg = Debug|Win32
43+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Debug|x86.Build.0 = Debug|Win32
44+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|ARM64.ActiveCfg = Release|x64
45+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|ARM64.Build.0 = Release|x64
46+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|x64.ActiveCfg = Release|x64
47+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|x64.Build.0 = Release|x64
48+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|x86.ActiveCfg = Release|Win32
49+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.DLL Release|x86.Build.0 = Release|Win32
50+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|ARM64.ActiveCfg = Release|x64
51+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|ARM64.Build.0 = Release|x64
52+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|x64.ActiveCfg = Release|x64
53+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|x64.Build.0 = Release|x64
54+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|x86.ActiveCfg = Release|Win32
55+
{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}.Release|x86.Build.0 = Release|Win32
56+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Debug|ARM64.ActiveCfg = Debug|ARM64
57+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Debug|ARM64.Build.0 = Debug|ARM64
58+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Debug|x64.ActiveCfg = Debug|x64
59+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Debug|x64.Build.0 = Debug|x64
60+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Debug|x86.ActiveCfg = Debug|Win32
61+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Debug|x86.Build.0 = Debug|Win32
62+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Debug|ARM64.ActiveCfg = DLL Debug|ARM64
63+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Debug|ARM64.Build.0 = DLL Debug|ARM64
64+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
65+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Debug|x64.Build.0 = DLL Debug|x64
66+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Debug|x86.ActiveCfg = DLL Debug|Win32
67+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Debug|x86.Build.0 = DLL Debug|Win32
68+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Release|ARM64.ActiveCfg = DLL Release|ARM64
69+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Release|ARM64.Build.0 = DLL Release|ARM64
70+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Release|x64.ActiveCfg = DLL Release|x64
71+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Release|x64.Build.0 = DLL Release|x64
72+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Release|x86.ActiveCfg = DLL Release|Win32
73+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.DLL Release|x86.Build.0 = DLL Release|Win32
74+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Release|ARM64.ActiveCfg = Release|ARM64
75+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Release|ARM64.Build.0 = Release|ARM64
76+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Release|x64.ActiveCfg = Release|x64
77+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Release|x64.Build.0 = Release|x64
78+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Release|x86.ActiveCfg = Release|Win32
79+
{12226DBE-7278-4DFA-A119-5A0294CF0B33}.Release|x86.Build.0 = Release|Win32
80+
EndGlobalSection
81+
GlobalSection(SolutionProperties) = preSolution
82+
HideSolutionNode = FALSE
83+
EndGlobalSection
84+
GlobalSection(ExtensibilityGlobals) = postSolution
85+
SolutionGuid = {667F2496-F8F1-4DBD-8AAA-78BAD16ED1BA}
86+
EndGlobalSection
87+
EndGlobal

‎wolfcrypt/benchmark/benchmark-VS2022.vcxproj‎

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<VCProjectVersion>17.0</VCProjectVersion>
23+
<ProjectGuid>{D04BDF66-664A-4D59-BEAC-8AB2D5809C21}</ProjectGuid>
24+
<Keyword>Win32Proj</Keyword>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28+
<ConfigurationType>Application</ConfigurationType>
29+
<PlatformToolset>v143</PlatformToolset>
30+
</PropertyGroup>
31+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
32+
<ConfigurationType>Application</ConfigurationType>
33+
<PlatformToolset>v143</PlatformToolset>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
36+
<ConfigurationType>Application</ConfigurationType>
37+
<PlatformToolset>v143</PlatformToolset>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
40+
<ConfigurationType>Application</ConfigurationType>
41+
<PlatformToolset>v143</PlatformToolset>
42+
</PropertyGroup>
43+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
44+
<ImportGroup Label="ExtensionSettings">
45+
</ImportGroup>
46+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
47+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
48+
</ImportGroup>
49+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
50+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
51+
</ImportGroup>
52+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
53+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
54+
</ImportGroup>
55+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
56+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57+
</ImportGroup>
58+
<PropertyGroup Label="UserMacros" />
59+
<PropertyGroup>
60+
<_ProjectFileVersion>17.0.35327.3</_ProjectFileVersion>
61+
</PropertyGroup>
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
63+
<OutDir>Debug\</OutDir>
64+
<IntDir>Debug\</IntDir>
65+
<LinkIncremental>true</LinkIncremental>
66+
</PropertyGroup>
67+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
68+
<LinkIncremental>true</LinkIncremental>
69+
</PropertyGroup>
70+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
71+
<OutDir>Release\</OutDir>
72+
<IntDir>Release\</IntDir>
73+
<LinkIncremental>true</LinkIncremental>
74+
</PropertyGroup>
75+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
76+
<LinkIncremental>true</LinkIncremental>
77+
</PropertyGroup>
78+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
79+
<ClCompile>
80+
<Optimization>Disabled</Optimization>
81+
<AdditionalIncludeDirectories>../..;../../IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
83+
<MinimalRebuild>true</MinimalRebuild>
84+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
85+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
86+
<PrecompiledHeader />
87+
<WarningLevel>Level3</WarningLevel>
88+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
89+
</ClCompile>
90+
<Link>
91+
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
92+
<GenerateDebugInformation>true</GenerateDebugInformation>
93+
<SubSystem>Console</SubSystem>
94+
<TargetMachine>MachineX86</TargetMachine>
95+
</Link>
96+
</ItemDefinitionGroup>
97+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
98+
<ClCompile>
99+
<Optimization>Disabled</Optimization>
100+
<AdditionalIncludeDirectories>../..;../../IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
103+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
104+
<PrecompiledHeader>
105+
</PrecompiledHeader>
106+
<WarningLevel>Level3</WarningLevel>
107+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
108+
</ClCompile>
109+
<Link>
110+
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
111+
<GenerateDebugInformation>true</GenerateDebugInformation>
112+
<SubSystem>Console</SubSystem>
113+
</Link>
114+
</ItemDefinitionGroup>
115+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
116+
<ClCompile>
117+
<AdditionalIncludeDirectories>../..;../../IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
118+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
120+
<PrecompiledHeader />
121+
<WarningLevel>Level3</WarningLevel>
122+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
123+
</ClCompile>
124+
<Link>
125+
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
126+
<GenerateDebugInformation>true</GenerateDebugInformation>
127+
<SubSystem>Console</SubSystem>
128+
<OptimizeReferences>true</OptimizeReferences>
129+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
130+
<TargetMachine>MachineX86</TargetMachine>
131+
</Link>
132+
</ItemDefinitionGroup>
133+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
134+
<ClCompile>
135+
<AdditionalIncludeDirectories>../..;../../IDE/WIN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
136+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
138+
<PrecompiledHeader>
139+
</PrecompiledHeader>
140+
<WarningLevel>Level3</WarningLevel>
141+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
142+
</ClCompile>
143+
<Link>
144+
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
145+
<GenerateDebugInformation>true</GenerateDebugInformation>
146+
<SubSystem>Console</SubSystem>
147+
<OptimizeReferences>true</OptimizeReferences>
148+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
149+
</Link>
150+
</ItemDefinitionGroup>
151+
<ItemGroup>
152+
<ClCompile Include="benchmark.c" />
153+
</ItemGroup>
154+
<ItemGroup>
155+
<ProjectReference Include="..\..\wolfssl-VS2022.vcxproj">
156+
<Project>{12226dbe-7278-4dfa-a119-5a0294cf0b33}</Project>
157+
</ProjectReference>
158+
</ItemGroup>
159+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
160+
<ImportGroup Label="ExtensionTargets">
161+
</ImportGroup>
162+
</Project>

‎wolfcrypt/benchmark/benchmark-VS2022.vcxproj.user‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4+
<LocalDebuggerWorkingDirectory>$(ProjectDir)../../</LocalDebuggerWorkingDirectory>
5+
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
6+
</PropertyGroup>
7+
</Project>

‎wolfcrypt/benchmark/include.am‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ endif
2323

2424
EXTRA_DIST += wolfcrypt/benchmark/benchmark.sln
2525
EXTRA_DIST += wolfcrypt/benchmark/benchmark.vcproj
26+
EXTRA_DIST += wolfcrypt/benchmark/benchmark-VS2022.sln
27+
EXTRA_DIST += wolfcrypt/benchmark/benchmark-VS2022.vcxproj
28+
EXTRA_DIST += wolfcrypt/benchmark/benchmark-VS2022.vcxproj.user
2629
EXTRA_DIST += wolfcrypt/benchmark/README.md
2730
DISTCLEANFILES+= wolfcrypt/benchmark/.libs/benchmark

‎wolfcrypt/test/include.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@ endif
2626

2727
EXTRA_DIST += wolfcrypt/test/test.sln
2828
EXTRA_DIST += wolfcrypt/test/test.vcproj
29+
EXTRA_DIST += wolfcrypt/test/test-VS2022.sln
30+
EXTRA_DIST += wolfcrypt/test/test-VS2022.vcxproj
31+
EXTRA_DIST += wolfcrypt/test/test-VS2022.vcxproj.user
32+
2933
EXTRA_DIST += wolfcrypt/test/README.md
3034
DISTCLEANFILES+= wolfcrypt/test/.libs/testwolfcrypt

0 commit comments

Comments
 (0)