From 22fb016d95eabea87554eec464148bb7bbbde61a Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Thu, 11 Jul 2024 19:53:51 +0100
Subject: [PATCH] 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         | 11 ++++++++++-
 templates/cpp/static/BuildMain.xml |  3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 7fe7c97f2..15be32417 100755
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -389,7 +389,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 5e01a10fe..aabf1f41c 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" />
diff --git a/templates/cpp/static/BuildMain.xml b/templates/cpp/static/BuildMain.xml
index dda4b8a70..f49c7e5c8 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::