From 4e758515efab280fbcba21f421bd7b43dc6286bf Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 7 Nov 2017 16:12:03 -0800
Subject: [PATCH] Enable mbedTLS by default

---
 project/Build.xml | 4 ++--
 project/lib/curl  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 3730d3bba..045ebcf44 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -9,7 +9,7 @@
 	<set name="ios" value="1" if="iphone" />
 	<set name="tvos" value="1" if="appletv" />
 	
-	<set name="LIME_AXTLS" value="1" unless="emscripten || mac || iphone" />
+	<!-- <set name="LIME_AXTLS" value="1" /> -->
 	<set name="LIME_CAIRO" value="1" />
 	<set name="LIME_CURL" value="1" unless="emscripten" />
 	<set name="LIME_EFSW" value="1" if="windows || mac || linux" />
@@ -17,7 +17,7 @@
 	<set name="LIME_FREETYPE" value="1" />
 	<set name="LIME_HARFBUZZ" value="1" />
 	<set name="LIME_LZMA" value="1" />
-	<set name="LIME_MBEDTLS" value="1" if="mac || iphone" />
+	<set name="LIME_MBEDTLS" value="1" unless="emscripten" />
 	<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
 	<set name="LIME_OGG" value="1" />
 	<set name="LIME_OPENALSOFT" value="1" if="windows || linux || android" unless="static_link" />
diff --git a/project/lib/curl b/project/lib/curl
index d65a53824..cc4838956 160000
--- a/project/lib/curl
+++ b/project/lib/curl
@@ -1 +1 @@
-Subproject commit d65a53824cbaa2dab9cc3598fa00f2a3a0593b98
+Subproject commit cc4838956b1498aa6a05e16a7ec749354eeaee26