Skip to content

Commit ce5878f

Browse files
dgarskedgarske
authored
Merge pull request #9162 from embhorn/zd18673
Fixes for INTIME RTOS
2 parents 71068a4 + 2179dcc commit ce5878f

10 files changed

Lines changed: 1256 additions & 308 deletions

File tree

‎IDE/INTIME-RTOS/Makefile‎

Lines changed: 516 additions & 0 deletions
Large diffs are not rendered by default.

‎IDE/INTIME-RTOS/include.am‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ EXTRA_DIST += \
1010
IDE/INTIME-RTOS/wolfExamples.c \
1111
IDE/INTIME-RTOS/wolfExamples.h \
1212
IDE/INTIME-RTOS/wolfExamples.vcxproj \
13-
IDE/INTIME-RTOS/wolfExamples.sln
13+
IDE/INTIME-RTOS/wolfExamples.sln \
14+
IDE/INTIME-RTOS/wolfssl-lib.sln \
15+
IDE/INTIME-RTOS/wolfssl-lib.vcxproj \
16+
IDE/INTIME-RTOS/Makefile

‎IDE/INTIME-RTOS/libwolfssl.vcxproj‎

100755100644
Lines changed: 234 additions & 210 deletions
Large diffs are not rendered by default.

‎IDE/INTIME-RTOS/user_settings.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ extern "C" {
284284
#undef OPENSSL_EXTRA
285285
#define OPENSSL_EXTRA
286286

287+
#undef OPENSSL_ALL
288+
#define OPENSSL_ALL
289+
287290
#undef WOLFSSL_BASE64_ENCODE
288291
#define WOLFSSL_BASE64_ENCODE
289292

‎IDE/INTIME-RTOS/wolfExamples.vcxproj‎

100755100644
Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|INtime">
5-
<Configuration>Debug</Configuration>
6-
<Platform>INtime</Platform>
7-
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|INtime">
9-
<Configuration>Release</Configuration>
10-
<Platform>INtime</Platform>
11-
</ProjectConfiguration>
12-
</ItemGroup>
13-
<ItemGroup>
14-
<Text Include="README.md" />
15-
</ItemGroup>
16-
<ItemGroup>
17-
<ClCompile Include="wolfExamples.c" />
18-
<ClCompile Include="..\..\wolfcrypt\test\test.c" />
19-
<ClCompile Include="..\..\wolfcrypt\benchmark\benchmark.c" />
20-
</ItemGroup>
21-
<ItemGroup>
22-
<ClInclude Include="user_settings.h" />
23-
<ClInclude Include="wolfExamples.h" />
24-
</ItemGroup>
25-
<PropertyGroup Label="Globals">
26-
<ProjectGuid>{557A7EFD-2627-478A-A855-50F518DD13EE}</ProjectGuid>
27-
<ProjectName>wolfExamples</ProjectName>
28-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
29-
</PropertyGroup>
30-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
31-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|INtime'" Label="Configuration">
32-
<ConfigurationType>Application</ConfigurationType>
33-
<CharacterSet>NotSet</CharacterSet>
34-
<PlatformToolset>v140</PlatformToolset>
35-
</PropertyGroup>
36-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|INtime'" Label="Configuration">
37-
<ConfigurationType>Application</ConfigurationType>
38-
<WholeProgramOptimization>false</WholeProgramOptimization>
39-
<CharacterSet>NotSet</CharacterSet>
40-
<PlatformToolset>v140</PlatformToolset>
41-
</PropertyGroup>
42-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43-
<ImportGroup Label="ExtensionSettings">
44-
</ImportGroup>
45-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|INtime'">
46-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
47-
</ImportGroup>
48-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|INtime'">
49-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
50-
</ImportGroup>
51-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|INtime'">
52-
<IntDir>$(Configuration)_$(ProjectName)\</IntDir>
53-
</PropertyGroup>
54-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|INtime'">
55-
<IntDir>$(Configuration)_$(ProjectName)\</IntDir>
56-
</PropertyGroup>
57-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|INtime'">
58-
<ClCompile>
59-
</ClCompile>
60-
<Link>
61-
<Version>21076.20053</Version>
62-
<AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions>
63-
<AdditionalDependencies>rt.lib;pcibus.lib;netlib.lib;clib.lib;vshelper.lib;libwolfssl.lib</AdditionalDependencies>
64-
<OutputFile>$(SolutionDir)$(Configuration)\\wolfExamples.rta</OutputFile>
65-
<AdditionalLibraryDirectories>$(ProjectDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
66-
</Link>
67-
<ClCompile>
68-
<ExceptionHandling>Async</ExceptionHandling>
69-
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;_USE_64BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71-
</ClCompile>
72-
</ItemDefinitionGroup>
73-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|INtime'">
74-
<ClCompile>
75-
</ClCompile>
76-
<Link>
77-
<Version>21076.20053</Version>
78-
<AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions>
79-
<AdditionalDependencies>rt.lib;pcibus.lib;netlib.lib;clib.lib;vshelper.lib;libwolfssl.lib</AdditionalDependencies>
80-
<OutputFile>$(SolutionDir)$(Configuration)\\wolfExamples.rta</OutputFile>
81-
<AdditionalLibraryDirectories>$(ProjectDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
82-
</Link>
83-
<ClCompile>
84-
<ExceptionHandling>Async</ExceptionHandling>
85-
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
86-
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87-
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
88-
</ClCompile>
89-
</ItemDefinitionGroup>
90-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
91-
<ImportGroup Label="ExtensionTargets">
92-
</ImportGroup>
93-
</Project>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|INtime">
5+
<Configuration>Debug</Configuration>
6+
<Platform>INtime</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|INtime">
9+
<Configuration>Release</Configuration>
10+
<Platform>INtime</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<Text Include="README.md" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<ClCompile Include="wolfExamples.c" />
18+
<ClCompile Include="..\..\wolfcrypt\test\test.c" />
19+
<ClCompile Include="..\..\wolfcrypt\benchmark\benchmark.c" />
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ClInclude Include="user_settings.h" />
23+
<ClInclude Include="wolfExamples.h" />
24+
</ItemGroup>
25+
<PropertyGroup Label="Globals">
26+
<ProjectGuid>{557A7EFD-2627-478A-A855-50F518DD13EE}</ProjectGuid>
27+
<ProjectName>wolfExamples</ProjectName>
28+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
29+
</PropertyGroup>
30+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
31+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|INtime'" Label="Configuration">
32+
<ConfigurationType>Application</ConfigurationType>
33+
<CharacterSet>NotSet</CharacterSet>
34+
<PlatformToolset>v142</PlatformToolset>
35+
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|INtime'" Label="Configuration">
37+
<ConfigurationType>Application</ConfigurationType>
38+
<WholeProgramOptimization>false</WholeProgramOptimization>
39+
<CharacterSet>NotSet</CharacterSet>
40+
<PlatformToolset>v142</PlatformToolset>
41+
</PropertyGroup>
42+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43+
<ImportGroup Label="ExtensionSettings">
44+
</ImportGroup>
45+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|INtime'">
46+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
47+
</ImportGroup>
48+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|INtime'">
49+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
50+
</ImportGroup>
51+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|INtime'">
52+
<IntDir>$(Configuration)_$(ProjectName)\</IntDir>
53+
</PropertyGroup>
54+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|INtime'">
55+
<IntDir>$(Configuration)_$(ProjectName)\</IntDir>
56+
</PropertyGroup>
57+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|INtime'">
58+
<ClCompile>
59+
</ClCompile>
60+
<Link>
61+
<Version>21076.20053</Version>
62+
<AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions>
63+
<AdditionalDependencies>rt.lib;pcibus.lib;netlib.lib;clib.lib;vshelper.lib;libwolfssl.lib</AdditionalDependencies>
64+
<OutputFile>$(SolutionDir)$(Configuration)\\wolfExamples.rta</OutputFile>
65+
<AdditionalLibraryDirectories>$(ProjectDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
66+
</Link>
67+
<ClCompile>
68+
<ExceptionHandling>Async</ExceptionHandling>
69+
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;_USE_64BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
70+
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71+
</ClCompile>
72+
</ItemDefinitionGroup>
73+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|INtime'">
74+
<ClCompile>
75+
</ClCompile>
76+
<Link>
77+
<Version>21076.20053</Version>
78+
<AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions>
79+
<AdditionalDependencies>rt.lib;pcibus.lib;netlib.lib;clib.lib;vshelper.lib;libwolfssl.lib</AdditionalDependencies>
80+
<OutputFile>$(SolutionDir)$(Configuration)\\wolfExamples.rta</OutputFile>
81+
<AdditionalLibraryDirectories>$(ProjectDir)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
82+
</Link>
83+
<ClCompile>
84+
<ExceptionHandling>Async</ExceptionHandling>
85+
<PreprocessorDefinitions>WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
86+
<AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
88+
</ClCompile>
89+
</ItemDefinitionGroup>
90+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
91+
<ImportGroup Label="ExtensionTargets">
92+
</ImportGroup>
93+
</Project>

‎IDE/INTIME-RTOS/wolfssl-lib.sln‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl-lib", "wolfssl-lib.vcxproj", "{3BBA3633-A077-4A57-A242-0A22328E5CF6}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|INtime = Debug|INtime
11+
Release|INtime = Release|INtime
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{3BBA3633-A077-4A57-A242-0A22328E5CF6}.Debug|INtime.ActiveCfg = Debug|INtime
15+
{3BBA3633-A077-4A57-A242-0A22328E5CF6}.Debug|INtime.Build.0 = Debug|INtime
16+
{3BBA3633-A077-4A57-A242-0A22328E5CF6}.Release|INtime.ActiveCfg = Release|INtime
17+
{3BBA3633-A077-4A57-A242-0A22328E5CF6}.Release|INtime.Build.0 = Release|INtime
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
EndGlobal

0 commit comments

Comments
 (0)