Skip to content

Commit aa139a4

Browse files
jakcronjakcron
authored
Merge pull request #2 from jakcron/v0.2-mbedtls
Update VS build files.
2 parents 4251399 + 642f243 commit aa139a4

File tree

6 files changed

+787
-263
lines changed

6 files changed

+787
-263
lines changed

‎BUILDING.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
* [Visual Studio Community](https://visualstudio.microsoft.com/vs/community/) 2015 or 2017
1616

1717
### Compiling Library
18-
* Open `build/visualstudio/libpolarssl.sln` in Visual Studio
18+
* Open `build/visualstudio/libmbedtls.sln` in Visual Studio
1919
* Select Target (e.g `Debug`|`Release` & `x86`|`x64`)
2020
* Navigate to `Build`->`Build Solution`
2121

22-
### Including libpolarssl in another VS Solution for static linking
23-
* Clone `libpolarssl` as a submodule into your project
22+
### Including libmbedtls in another VS Solution for static linking
23+
* Clone `libmbedtls` as a submodule into your project
2424
* Navigate to the `Solution Explorer` window
2525
* Right-click on the Solution Item and select `Add`->`Existing Project...`
26-
* In the filesystem popup window open `<libpolarssl location>\build\visualstudio\libpolarssl\libpolarssl.vcxproj`
27-
* Update each dependant project's `References` to include libpolarssl
28-
* Update each dependant project's `Property Pages` so that for `All Configurations` and `All Platforms` the `Addition Include Directories` has the relative path to `<libpolarssl location>\include`
29-
* If `libpolarssl` is being included as a dependency in a similarly structured project the relative path is `$(SolutionDir)..\..\deps\libpolarssl\include`
30-
* Update the `Project Build Order` so libpolarssl is built before any of its dependants
31-
* Update the `Project Dependencies` so that each dependant has the box checked for libpolarssl
26+
* In the filesystem popup window open `<libmbedtls location>\build\visualstudio\libmbedtls\libmbedtls.vcxproj`
27+
* Update each dependant project's `References` to include libmbedtls
28+
* Update each dependant project's `Property Pages` so that for `All Configurations` and `All Platforms` the `Addition Include Directories` has the relative path to `<libmbedtls location>\include`
29+
* If `libmbedtls` is being included as a dependency in a similarly structured project the relative path is `$(SolutionDir)..\..\deps\libmbedtls\include`
30+
* Update the `Project Build Order` so libmbedtls is built before any of its dependants
31+
* Update the `Project Dependencies` so that each dependant has the box checked for libmbedtls

‎build/visualstudio/libpolarssl.sln renamed to ‎build/visualstudio/libmbedtls.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.28010.2036
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpolarssl", "libpolarssl\libpolarssl.vcxproj", "{7A7C66F3-2B5B-4E23-85D8-2A74FEDAD92C}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmbedtls", "libmbedtls\libmbedtls.vcxproj", "{7A7C66F3-2B5B-4E23-85D8-2A74FEDAD92C}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎build/visualstudio/libmbedtls/libmbedtls.vcxproj

Lines changed: 285 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,285 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" 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="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</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>15.0</VCProjectVersion>
23+
<ProjectGuid>{7A7C66F3-2B5B-4E23-85D8-2A74FEDAD92C}</ProjectGuid>
24+
<RootNamespace>libmbedtls</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
26+
</PropertyGroup>
27+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29+
<ConfigurationType>StaticLibrary</ConfigurationType>
30+
<UseDebugLibraries>true</UseDebugLibraries>
31+
<PlatformToolset>v141</PlatformToolset>
32+
<CharacterSet>MultiByte</CharacterSet>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35+
<ConfigurationType>StaticLibrary</ConfigurationType>
36+
<UseDebugLibraries>false</UseDebugLibraries>
37+
<PlatformToolset>v141</PlatformToolset>
38+
<WholeProgramOptimization>true</WholeProgramOptimization>
39+
<CharacterSet>MultiByte</CharacterSet>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42+
<ConfigurationType>StaticLibrary</ConfigurationType>
43+
<UseDebugLibraries>true</UseDebugLibraries>
44+
<PlatformToolset>v141</PlatformToolset>
45+
<CharacterSet>MultiByte</CharacterSet>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48+
<ConfigurationType>StaticLibrary</ConfigurationType>
49+
<UseDebugLibraries>false</UseDebugLibraries>
50+
<PlatformToolset>v141</PlatformToolset>
51+
<WholeProgramOptimization>true</WholeProgramOptimization>
52+
<CharacterSet>MultiByte</CharacterSet>
53+
</PropertyGroup>
54+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
55+
<ImportGroup Label="ExtensionSettings">
56+
</ImportGroup>
57+
<ImportGroup Label="Shared">
58+
</ImportGroup>
59+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
60+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61+
</ImportGroup>
62+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
63+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64+
</ImportGroup>
65+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
66+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67+
</ImportGroup>
68+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
69+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70+
</ImportGroup>
71+
<PropertyGroup Label="UserMacros" />
72+
<PropertyGroup />
73+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74+
<ClCompile>
75+
<WarningLevel>Level3</WarningLevel>
76+
<Optimization>Disabled</Optimization>
77+
<SDLCheck>true</SDLCheck>
78+
<ConformanceMode>true</ConformanceMode>
79+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\include;</AdditionalIncludeDirectories>
80+
</ClCompile>
81+
</ItemDefinitionGroup>
82+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
83+
<ClCompile>
84+
<WarningLevel>Level3</WarningLevel>
85+
<Optimization>Disabled</Optimization>
86+
<SDLCheck>true</SDLCheck>
87+
<ConformanceMode>true</ConformanceMode>
88+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\include;</AdditionalIncludeDirectories>
89+
</ClCompile>
90+
</ItemDefinitionGroup>
91+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
92+
<ClCompile>
93+
<WarningLevel>Level3</WarningLevel>
94+
<Optimization>MaxSpeed</Optimization>
95+
<FunctionLevelLinking>true</FunctionLevelLinking>
96+
<IntrinsicFunctions>true</IntrinsicFunctions>
97+
<SDLCheck>true</SDLCheck>
98+
<ConformanceMode>true</ConformanceMode>
99+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\include;</AdditionalIncludeDirectories>
100+
</ClCompile>
101+
<Link>
102+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
103+
<OptimizeReferences>true</OptimizeReferences>
104+
</Link>
105+
</ItemDefinitionGroup>
106+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
107+
<ClCompile>
108+
<WarningLevel>Level3</WarningLevel>
109+
<Optimization>MaxSpeed</Optimization>
110+
<FunctionLevelLinking>true</FunctionLevelLinking>
111+
<IntrinsicFunctions>true</IntrinsicFunctions>
112+
<SDLCheck>true</SDLCheck>
113+
<ConformanceMode>true</ConformanceMode>
114+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\include;</AdditionalIncludeDirectories>
115+
</ClCompile>
116+
<Link>
117+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
118+
<OptimizeReferences>true</OptimizeReferences>
119+
</Link>
120+
</ItemDefinitionGroup>
121+
<ItemGroup>
122+
<ClInclude Include="..\..\..\include\mbedtls\aes.h" />
123+
<ClInclude Include="..\..\..\include\mbedtls\aesni.h" />
124+
<ClInclude Include="..\..\..\include\mbedtls\arc4.h" />
125+
<ClInclude Include="..\..\..\include\mbedtls\aria.h" />
126+
<ClInclude Include="..\..\..\include\mbedtls\asn1.h" />
127+
<ClInclude Include="..\..\..\include\mbedtls\asn1write.h" />
128+
<ClInclude Include="..\..\..\include\mbedtls\base64.h" />
129+
<ClInclude Include="..\..\..\include\mbedtls\bignum.h" />
130+
<ClInclude Include="..\..\..\include\mbedtls\blowfish.h" />
131+
<ClInclude Include="..\..\..\include\mbedtls\bn_mul.h" />
132+
<ClInclude Include="..\..\..\include\mbedtls\camellia.h" />
133+
<ClInclude Include="..\..\..\include\mbedtls\ccm.h" />
134+
<ClInclude Include="..\..\..\include\mbedtls\certs.h" />
135+
<ClInclude Include="..\..\..\include\mbedtls\chacha20.h" />
136+
<ClInclude Include="..\..\..\include\mbedtls\chachapoly.h" />
137+
<ClInclude Include="..\..\..\include\mbedtls\check_config.h" />
138+
<ClInclude Include="..\..\..\include\mbedtls\cipher.h" />
139+
<ClInclude Include="..\..\..\include\mbedtls\cipher_internal.h" />
140+
<ClInclude Include="..\..\..\include\mbedtls\cmac.h" />
141+
<ClInclude Include="..\..\..\include\mbedtls\compat-1" />.3.h
142+
<ClInclude Include="..\..\..\include\mbedtls\config.h" />
143+
<ClInclude Include="..\..\..\include\mbedtls\ctr_drbg.h" />
144+
<ClInclude Include="..\..\..\include\mbedtls\debug.h" />
145+
<ClInclude Include="..\..\..\include\mbedtls\des.h" />
146+
<ClInclude Include="..\..\..\include\mbedtls\dhm.h" />
147+
<ClInclude Include="..\..\..\include\mbedtls\ecdh.h" />
148+
<ClInclude Include="..\..\..\include\mbedtls\ecdsa.h" />
149+
<ClInclude Include="..\..\..\include\mbedtls\ecjpake.h" />
150+
<ClInclude Include="..\..\..\include\mbedtls\ecp.h" />
151+
<ClInclude Include="..\..\..\include\mbedtls\ecp_internal.h" />
152+
<ClInclude Include="..\..\..\include\mbedtls\entropy.h" />
153+
<ClInclude Include="..\..\..\include\mbedtls\entropy_poll.h" />
154+
<ClInclude Include="..\..\..\include\mbedtls\error.h" />
155+
<ClInclude Include="..\..\..\include\mbedtls\gcm.h" />
156+
<ClInclude Include="..\..\..\include\mbedtls\havege.h" />
157+
<ClInclude Include="..\..\..\include\mbedtls\hkdf.h" />
158+
<ClInclude Include="..\..\..\include\mbedtls\hmac_drbg.h" />
159+
<ClInclude Include="..\..\..\include\mbedtls\md.h" />
160+
<ClInclude Include="..\..\..\include\mbedtls\md2.h" />
161+
<ClInclude Include="..\..\..\include\mbedtls\md4.h" />
162+
<ClInclude Include="..\..\..\include\mbedtls\md5.h" />
163+
<ClInclude Include="..\..\..\include\mbedtls\md_internal.h" />
164+
<ClInclude Include="..\..\..\include\mbedtls\memory_buffer_alloc.h" />
165+
<ClInclude Include="..\..\..\include\mbedtls\net.h" />
166+
<ClInclude Include="..\..\..\include\mbedtls\net_sockets.h" />
167+
<ClInclude Include="..\..\..\include\mbedtls\nist_kw.h" />
168+
<ClInclude Include="..\..\..\include\mbedtls\oid.h" />
169+
<ClInclude Include="..\..\..\include\mbedtls\padlock.h" />
170+
<ClInclude Include="..\..\..\include\mbedtls\pem.h" />
171+
<ClInclude Include="..\..\..\include\mbedtls\pk.h" />
172+
<ClInclude Include="..\..\..\include\mbedtls\pk_internal.h" />
173+
<ClInclude Include="..\..\..\include\mbedtls\pkcs11.h" />
174+
<ClInclude Include="..\..\..\include\mbedtls\pkcs12.h" />
175+
<ClInclude Include="..\..\..\include\mbedtls\pkcs5.h" />
176+
<ClInclude Include="..\..\..\include\mbedtls\platform.h" />
177+
<ClInclude Include="..\..\..\include\mbedtls\platform_time.h" />
178+
<ClInclude Include="..\..\..\include\mbedtls\platform_util.h" />
179+
<ClInclude Include="..\..\..\include\mbedtls\poly1305.h" />
180+
<ClInclude Include="..\..\..\include\mbedtls\ripemd160.h" />
181+
<ClInclude Include="..\..\..\include\mbedtls\rsa.h" />
182+
<ClInclude Include="..\..\..\include\mbedtls\rsa_internal.h" />
183+
<ClInclude Include="..\..\..\include\mbedtls\sha1.h" />
184+
<ClInclude Include="..\..\..\include\mbedtls\sha256.h" />
185+
<ClInclude Include="..\..\..\include\mbedtls\sha512.h" />
186+
<ClInclude Include="..\..\..\include\mbedtls\ssl.h" />
187+
<ClInclude Include="..\..\..\include\mbedtls\ssl_cache.h" />
188+
<ClInclude Include="..\..\..\include\mbedtls\ssl_ciphersuites.h" />
189+
<ClInclude Include="..\..\..\include\mbedtls\ssl_cookie.h" />
190+
<ClInclude Include="..\..\..\include\mbedtls\ssl_internal.h" />
191+
<ClInclude Include="..\..\..\include\mbedtls\ssl_ticket.h" />
192+
<ClInclude Include="..\..\..\include\mbedtls\threading.h" />
193+
<ClInclude Include="..\..\..\include\mbedtls\timing.h" />
194+
<ClInclude Include="..\..\..\include\mbedtls\version.h" />
195+
<ClInclude Include="..\..\..\include\mbedtls\x509.h" />
196+
<ClInclude Include="..\..\..\include\mbedtls\x509_crl.h" />
197+
<ClInclude Include="..\..\..\include\mbedtls\x509_crt.h" />
198+
<ClInclude Include="..\..\..\include\mbedtls\x509_csr.h" />
199+
<ClInclude Include="..\..\..\include\mbedtls\xtea.h" />
200+
</ItemGroup>
201+
<ItemGroup>
202+
<ClCompile Include="..\..\..\src\aes.c" />
203+
<ClCompile Include="..\..\..\src\aesni.c" />
204+
<ClCompile Include="..\..\..\src\arc4.c" />
205+
<ClCompile Include="..\..\..\src\aria.c" />
206+
<ClCompile Include="..\..\..\src\asn1parse.c" />
207+
<ClCompile Include="..\..\..\src\asn1write.c" />
208+
<ClCompile Include="..\..\..\src\base64.c" />
209+
<ClCompile Include="..\..\..\src\bignum.c" />
210+
<ClCompile Include="..\..\..\src\blowfish.c" />
211+
<ClCompile Include="..\..\..\src\camellia.c" />
212+
<ClCompile Include="..\..\..\src\ccm.c" />
213+
<ClCompile Include="..\..\..\src\certs.c" />
214+
<ClCompile Include="..\..\..\src\chacha20.c" />
215+
<ClCompile Include="..\..\..\src\chachapoly.c" />
216+
<ClCompile Include="..\..\..\src\cipher.c" />
217+
<ClCompile Include="..\..\..\src\cipher_wrap.c" />
218+
<ClCompile Include="..\..\..\src\cmac.c" />
219+
<ClCompile Include="..\..\..\src\ctr_drbg.c" />
220+
<ClCompile Include="..\..\..\src\debug.c" />
221+
<ClCompile Include="..\..\..\src\des.c" />
222+
<ClCompile Include="..\..\..\src\dhm.c" />
223+
<ClCompile Include="..\..\..\src\ecdh.c" />
224+
<ClCompile Include="..\..\..\src\ecdsa.c" />
225+
<ClCompile Include="..\..\..\src\ecjpake.c" />
226+
<ClCompile Include="..\..\..\src\ecp.c" />
227+
<ClCompile Include="..\..\..\src\ecp_curves.c" />
228+
<ClCompile Include="..\..\..\src\entropy.c" />
229+
<ClCompile Include="..\..\..\src\entropy_poll.c" />
230+
<ClCompile Include="..\..\..\src\error.c" />
231+
<ClCompile Include="..\..\..\src\gcm.c" />
232+
<ClCompile Include="..\..\..\src\havege.c" />
233+
<ClCompile Include="..\..\..\src\hkdf.c" />
234+
<ClCompile Include="..\..\..\src\hmac_drbg.c" />
235+
<ClCompile Include="..\..\..\src\md.c" />
236+
<ClCompile Include="..\..\..\src\md2.c" />
237+
<ClCompile Include="..\..\..\src\md4.c" />
238+
<ClCompile Include="..\..\..\src\md5.c" />
239+
<ClCompile Include="..\..\..\src\md_wrap.c" />
240+
<ClCompile Include="..\..\..\src\memory_buffer_alloc.c" />
241+
<ClCompile Include="..\..\..\src\net_sockets.c" />
242+
<ClCompile Include="..\..\..\src\nist_kw.c" />
243+
<ClCompile Include="..\..\..\src\oid.c" />
244+
<ClCompile Include="..\..\..\src\padlock.c" />
245+
<ClCompile Include="..\..\..\src\pem.c" />
246+
<ClCompile Include="..\..\..\src\pk.c" />
247+
<ClCompile Include="..\..\..\src\pk_wrap.c" />
248+
<ClCompile Include="..\..\..\src\pkcs11.c" />
249+
<ClCompile Include="..\..\..\src\pkcs12.c" />
250+
<ClCompile Include="..\..\..\src\pkcs5.c" />
251+
<ClCompile Include="..\..\..\src\pkparse.c" />
252+
<ClCompile Include="..\..\..\src\pkwrite.c" />
253+
<ClCompile Include="..\..\..\src\platform.c" />
254+
<ClCompile Include="..\..\..\src\platform_util.c" />
255+
<ClCompile Include="..\..\..\src\poly1305.c" />
256+
<ClCompile Include="..\..\..\src\ripemd160.c" />
257+
<ClCompile Include="..\..\..\src\rsa.c" />
258+
<ClCompile Include="..\..\..\src\rsa_internal.c" />
259+
<ClCompile Include="..\..\..\src\sha1.c" />
260+
<ClCompile Include="..\..\..\src\sha256.c" />
261+
<ClCompile Include="..\..\..\src\sha512.c" />
262+
<ClCompile Include="..\..\..\src\ssl_cache.c" />
263+
<ClCompile Include="..\..\..\src\ssl_ciphersuites.c" />
264+
<ClCompile Include="..\..\..\src\ssl_cli.c" />
265+
<ClCompile Include="..\..\..\src\ssl_cookie.c" />
266+
<ClCompile Include="..\..\..\src\ssl_srv.c" />
267+
<ClCompile Include="..\..\..\src\ssl_ticket.c" />
268+
<ClCompile Include="..\..\..\src\ssl_tls.c" />
269+
<ClCompile Include="..\..\..\src\threading.c" />
270+
<ClCompile Include="..\..\..\src\timing.c" />
271+
<ClCompile Include="..\..\..\src\version.c" />
272+
<ClCompile Include="..\..\..\src\version_features.c" />
273+
<ClCompile Include="..\..\..\src\x509.c" />
274+
<ClCompile Include="..\..\..\src\x509_create.c" />
275+
<ClCompile Include="..\..\..\src\x509_crl.c" />
276+
<ClCompile Include="..\..\..\src\x509_crt.c" />
277+
<ClCompile Include="..\..\..\src\x509_csr.c" />
278+
<ClCompile Include="..\..\..\src\x509write_crt.c" />
279+
<ClCompile Include="..\..\..\src\x509write_csr.c" />
280+
<ClCompile Include="..\..\..\src\xtea.c" />
281+
</ItemGroup>
282+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
283+
<ImportGroup Label="ExtensionTargets">
284+
</ImportGroup>
285+
</Project>

0 commit comments

Comments
 (0)