Permalink
Browse files

Merge pull request #110 from drichardson/fix-mbedtls-deprecation-warning

mbedtls/net.h is deprecated. Use mbedtls/net_sockets.h instead.
  • Loading branch information...
gafferongames committed Nov 14, 2018
2 parents fe4bdec + 9dd2c58 commit b3555f5c90634b1429584e13b22c9c746706d8cb
Showing with 7 additions and 7 deletions.
  1. +2 −2 .travis.yml
  2. +4 −4 docker/Dockerfile
  3. +1 −1 yojimbo.cpp
@@ -20,11 +20,11 @@ install:
- make
- sudo make install
- popd
- wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.1.5.tar.gz -O /tmp/mbedtls.tar.gz
- wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.13.0.tar.gz -O /tmp/mbedtls.tar.gz
- pushd .
- cd /tmp
- tar -zxvf mbedtls.tar.gz
- cd mbedtls-mbedtls-2.1.5
- cd mbedtls-mbedtls-2.13.0
- cmake .
- make
- sudo make install
@@ -1,4 +1,4 @@
FROM phusion/baseimage:0.9.18
FROM phusion/baseimage:0.11
CMD ["/sbin/my_init"]
@@ -21,9 +21,9 @@ RUN wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha1
rm premake-*.tar.gz && \
mv premake5 /usr/local/bin
RUN wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.1.5.tar.gz && \
tar -zxvf mbedtls-2.1.5.tar.gz && \
cd mbedtls-mbedtls-2.1.5 && \
RUN wget https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.13.0.tar.gz && \
tar -zxvf mbedtls-2.13.0.tar.gz && \
cd mbedtls-mbedtls-2.13.0 && \
cmake . && \
make && make install && \
ldconfig
@@ -842,7 +842,7 @@ double yojimbo_time()
#if YOJIMBO_WITH_MBEDTLS
#include <mbedtls/config.h>
#include <mbedtls/platform.h>
#include <mbedtls/net.h>
#include <mbedtls/net_sockets.h>
#include <mbedtls/debug.h>
#include <mbedtls/ssl.h>
#include <mbedtls/entropy.h>

0 comments on commit b3555f5

Please sign in to comment.