yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-25 16:55:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Makefile, CMake, and VisualC project file

Browse Source
This commit is contained in:
Hanno Becker 2020-01-31 14:14:51 +00:00
parent bd78add5d9
commit ddf5b17b8c
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/CMakeLists.txt
View File

@ -83,6 +83,9 @@ set(src_x509
set(src_tls set(src_tls
debug.c debug.c
net_sockets.c net_sockets.c
ssl_12_cli.c
ssl_12_gen.c
ssl_12_srv.c
ssl_cache.c ssl_cache.c
ssl_ciphersuites.c ssl_ciphersuites.c
ssl_cli.c ssl_cli.c
@ -90,6 +93,7 @@ set(src_tls
ssl_srv.c ssl_srv.c
ssl_ticket.c ssl_ticket.c
ssl_tls.c ssl_tls.c
ssl_msg.c
) )
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
@ -174,14 +178,14 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
if(USE_SHARED_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedx509 SHARED ${src_x509}) add_library(mbedx509 SHARED ${src_x509})
set_target_properties(mbedx509 PROPERTIES VERSION 2.20.0 SOVERSION 1) set_target_properties(mbedx509 PROPERTIES VERSION 2.19.1 SOVERSION 1)
target_link_libraries(mbedx509 ${libs} mbedcrypto) target_link_libraries(mbedx509 ${libs} mbedcrypto)
target_include_directories(mbedx509 target_include_directories(mbedx509
PUBLIC ${MBEDTLS_DIR}/include/ PUBLIC ${MBEDTLS_DIR}/include/
PUBLIC ${MBEDTLS_DIR}/crypto/include/) PUBLIC ${MBEDTLS_DIR}/crypto/include/)
add_library(mbedtls SHARED ${src_tls}) add_library(mbedtls SHARED ${src_tls})
set_target_properties(mbedtls PROPERTIES VERSION 2.20.0 SOVERSION 13) set_target_properties(mbedtls PROPERTIES VERSION 2.19.1 SOVERSION 13)
target_link_libraries(mbedtls ${libs} mbedx509) target_link_libraries(mbedtls ${libs} mbedx509)
target_include_directories(mbedtls target_include_directories(mbedtls
PUBLIC ${MBEDTLS_DIR}/include/ PUBLIC ${MBEDTLS_DIR}/include/

6
library/Makefile
View File

@ -37,7 +37,7 @@ endif
SOEXT_TLS=so.13 SOEXT_TLS=so.13
SOEXT_X509=so.1 SOEXT_X509=so.1
SOEXT_CRYPTO=so.4 SOEXT_CRYPTO=so.3
# Set AR_DASH= (empty string) to use an ar implementation that does not accept # Set AR_DASH= (empty string) to use an ar implementation that does not accept
# the - prefix for command line options (e.g. llvm-ar) # the - prefix for command line options (e.g. llvm-ar)
@ -75,10 +75,12 @@ OBJS_X509= certs.o pkcs11.o x509.o \
x509_csr.o x509write_crt.o x509write_csr.o x509_csr.o x509write_crt.o x509write_csr.o
OBJS_TLS= debug.o net_sockets.o \ OBJS_TLS= debug.o net_sockets.o \
ssl_12_cli.o ssl_12_gen.o \
ssl_12_srv.o \
ssl_cache.o ssl_ciphersuites.o \ ssl_cache.o ssl_ciphersuites.o \
ssl_cli.o ssl_cookie.o \ ssl_cli.o ssl_cookie.o \
ssl_srv.o ssl_ticket.o \ ssl_srv.o ssl_ticket.o \
ssl_tls.o ssl_tls.o ssl_msg.o
INCLUDING_FROM_MBEDTLS:=1 INCLUDING_FROM_MBEDTLS:=1
include ../crypto/3rdparty/Makefile.inc include ../crypto/3rdparty/Makefile.inc

4
visualc/VS2010/mbedTLS.vcxproj
View File

@ -257,10 +257,14 @@
<ClCompile Include="..\..\library\debug.c" /> <ClCompile Include="..\..\library\debug.c" />
<ClCompile Include="..\..\library\net_sockets.c" /> <ClCompile Include="..\..\library\net_sockets.c" />
<ClCompile Include="..\..\library\pkcs11.c" /> <ClCompile Include="..\..\library\pkcs11.c" />
<ClCompile Include="..\..\library\ssl_12_cli.c" />
<ClCompile Include="..\..\library\ssl_12_gen.c" />
<ClCompile Include="..\..\library\ssl_12_srv.c" />
<ClCompile Include="..\..\library\ssl_cache.c" /> <ClCompile Include="..\..\library\ssl_cache.c" />
<ClCompile Include="..\..\library\ssl_ciphersuites.c" /> <ClCompile Include="..\..\library\ssl_ciphersuites.c" />
<ClCompile Include="..\..\library\ssl_cli.c" /> <ClCompile Include="..\..\library\ssl_cli.c" />
<ClCompile Include="..\..\library\ssl_cookie.c" /> <ClCompile Include="..\..\library\ssl_cookie.c" />
<ClCompile Include="..\..\library\ssl_msg.c" />
<ClCompile Include="..\..\library\ssl_srv.c" /> <ClCompile Include="..\..\library\ssl_srv.c" />
<ClCompile Include="..\..\library\ssl_ticket.c" /> <ClCompile Include="..\..\library\ssl_ticket.c" />
<ClCompile Include="..\..\library\ssl_tls.c" /> <ClCompile Include="..\..\library\ssl_tls.c" />