From 0df09bcaa811575728bafa61fb106c7afabdbb3e Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Thu, 11 Jul 2024 19:53:51 +0100
Subject: [PATCH 1/3] Link against hxcpp's mbedtls in static builds

This avoids lime's mbedtls overwriting hxcpp's, which has caused issues
in the past.
---
 project/Build.xml                  |  2 +-
 project/lib/curl-files.xml         | 13 +++++++++++--
 templates/cpp/static/BuildMain.xml |  4 ++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 0310460d9a..50a514ba09 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -371,7 +371,7 @@
 		<files id="native-toolkit-harfbuzz" if="LIME_HARFBUZZ" />
 		<files id="native-toolkit-jpeg" if="LIME_JPEG" />
 		<files id="native-toolkit-lzma" if="LIME_LZMA" />
-		<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" />
+		<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" unless="static_link" />
 		<files id="native-toolkit-mojoal" if="LIME_MOJOAL" />
 		<files id="native-toolkit-neko" if="LIME_NEKO" />
 		<files id="native-toolkit-ogg" if="LIME_OGG" />
diff --git a/project/lib/curl-files.xml b/project/lib/curl-files.xml
index 432aa28f7b..aabf1f41c1 100644
--- a/project/lib/curl-files.xml
+++ b/project/lib/curl-files.xml
@@ -1,4 +1,5 @@
 <xml>
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" />
 
 	<files id="native-toolkit-curl-depends"  >
 		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/curl.h" />
@@ -23,7 +24,15 @@
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/" />
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/axtls" if="NATIVE_TOOLKIT_HAVE_AXTLS" />
-		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" if="NATIVE_TOOLKIT_HAVE_MBEDTLS" />
+
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" if="NATIVE_TOOLKIT_HAVE_MBEDTLS"  unless="static_link"/>
+		<section if="static_link">
+
+			<compilerflag value="-I${MBEDTLS_DIR}/include" />
+			<compilerflag value="-I${HXCPP}/src/hx/libs/ssl" />
+			<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;" />
+
+		</section>
 
 		<compilerflag value="-DBUILDING_LIBCURL" />
 		<compilerflag value="-DCURL_STATICLIB" />
@@ -167,4 +176,4 @@
 
 	</files>
 
-</xml>
\ No newline at end of file
+</xml>
diff --git a/templates/cpp/static/BuildMain.xml b/templates/cpp/static/BuildMain.xml
index ecc5071300..7656952edc 100644
--- a/templates/cpp/static/BuildMain.xml
+++ b/templates/cpp/static/BuildMain.xml
@@ -2,6 +2,8 @@
 
 	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
 
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" />
+
 	<files id="main">
 
 		<file name="Main.cpp" />
@@ -11,6 +13,7 @@
 	<target id="main" output="Main${DBG}" tool="linker" toolid="exe">
 
 		<files id="main" />
+		<files id="hxcpp_ssl" />
 		::foreach ndlls::
 		<lib name="::path::" />::end::
 
@@ -35,6 +38,7 @@
 			<lib name="rpcrt4.lib" />
 			<lib name="dwrite.lib" />
 			<lib name="setupapi.lib" />
+			<lib name="crypt32.lib" />
 
 		</section>
 

From 6377cce1647cf9b71beeee73378da06658e90e26 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Fri, 12 Jul 2024 11:03:56 +0100
Subject: [PATCH 2/3] Support hxcpp older than 4.3.0 for mbedtls linking

Hxcpp 4.3.0 has an mbedtls_config.h file in ${HXCPP}/src/hx/libs/ssl,
which we have to ensure is included, but older versions do not.

To support both 4.3.0 and older versions, we can add an empty
mbedtls_config.h and add the include path at the end. This way it will
only be used if it does not exist in the previous include paths.
---
 project/lib/curl-files.xml                        | 1 +
 project/lib/custom/mbedtls_hxcpp/mbedtls_config.h | 0
 2 files changed, 1 insertion(+)
 create mode 100644 project/lib/custom/mbedtls_hxcpp/mbedtls_config.h

diff --git a/project/lib/curl-files.xml b/project/lib/curl-files.xml
index aabf1f41c1..541d3cf4f2 100644
--- a/project/lib/curl-files.xml
+++ b/project/lib/curl-files.xml
@@ -30,6 +30,7 @@
 
 			<compilerflag value="-I${MBEDTLS_DIR}/include" />
 			<compilerflag value="-I${HXCPP}/src/hx/libs/ssl" />
+			<compilerflag value="-I${this_dir}/custom/mbedtls_hxcpp" />
 			<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;" />
 
 		</section>
diff --git a/project/lib/custom/mbedtls_hxcpp/mbedtls_config.h b/project/lib/custom/mbedtls_hxcpp/mbedtls_config.h
new file mode 100644
index 0000000000..e69de29bb2

From 13903b7245cf8b164478dcec5df28f816692aeec Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Fri, 12 Jul 2024 10:47:49 +0100
Subject: [PATCH 3/3] Update curl submodule

Hxcpp's mbedtls has MBEDTLS_NET_C disabled, which meant that older
versions of curl which use this feature cannot be linked against it.
This version of curl no longer requires this feature, which avoids the
issue.
---
 project/lib/curl           | 2 +-
 project/lib/curl-files.xml | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/project/lib/curl b/project/lib/curl
index 462196e6b4..c12fb3ddaf 160000
--- a/project/lib/curl
+++ b/project/lib/curl
@@ -1 +1 @@
-Subproject commit 462196e6b4a47f924293a0e26b8e9c23d37ac26f
+Subproject commit c12fb3ddaf48e709a7a4deaa55ec485e4df163ee
diff --git a/project/lib/curl-files.xml b/project/lib/curl-files.xml
index 541d3cf4f2..1f25e9962d 100644
--- a/project/lib/curl-files.xml
+++ b/project/lib/curl-files.xml
@@ -51,7 +51,6 @@
 
 			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/asyn-ares.c" />
 			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_multibyte.c" />
-			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/idn_win32.c" />
 			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/inet_ntop.c" />
 			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/inet_pton.c" />
 			<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/krb5.c" />
@@ -68,12 +67,12 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/asyn-thread.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/base64.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/bufref.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/cfilters.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/conncache.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/connect.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/content_encoding.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/cookie.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_addrinfo.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_ctype.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_des.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_endian.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_fnmatch.c" />
@@ -86,12 +85,12 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/curl_threads.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dict.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/doh.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dotdot.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/dynbuf.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/easy.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/escape.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/file.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/fileinfo.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/fopen.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/formdata.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ftp.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/ftplistparser.c" />
@@ -99,6 +98,7 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/getinfo.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/gopher.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hash.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/headers.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hmac.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostasyn.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/hostip.c" />
@@ -113,6 +113,7 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http_proxy.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/http.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/if2ip.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/idn.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/imap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/llist.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/md4.c" />
@@ -123,6 +124,7 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/multi.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/netrc.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/nonblock.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/noproxy.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/parsedate.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pingpong.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/pop3.c" />