From 00edf47529e6d37962f76c3a6c045df6b798f5b3 Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Thu, 11 Jul 2024 23:42:20 +0100
Subject: [PATCH] Add support for linking mbedtls on latest hxcpp

The latest hxcpp makes it easier to link against the internal mbedtls,
however we still need backwards compatibility.

https://github.com/HaxeFoundation/hxcpp/pull/1133
---
 project/lib/curl-files.xml                     | 18 +++++++++++++-----
 templates/cpp/static/BuildMain.xml             |  7 +++++--
 .../{{app.file}}/haxe/BuildHxcppMbedtls.xml    |  9 ++++++---
 templates/tvos/PROJ/haxe/BuildHxcppMbedtls.xml |  9 ++++++---
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/project/lib/curl-files.xml b/project/lib/curl-files.xml
index 1f25e9962..69220ce05 100644
--- a/project/lib/curl-files.xml
+++ b/project/lib/curl-files.xml
@@ -1,5 +1,7 @@
 <xml>
-	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" />
+	<include name="${HXCPP}/project/thirdparty/mbedtls_files.xml" noerror="true" if="static_link"/>
+	<set name="HAS_HXCPP_MBEDTLS_FLAGS" value="1" if="MBEDTLS_DIR" />
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="MBEDTLS_DIR"/>
 
 	<files id="native-toolkit-curl-depends"  >
 		<depend name="${NATIVE_TOOLKIT_PATH}/curl/include/curl/curl.h" />
@@ -28,10 +30,16 @@
 		<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="-I${this_dir}/custom/mbedtls_hxcpp" />
-			<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;" />
+			<include name="${HXCPP}/project/thirdparty/mbedtls_flags.xml" if="HAS_HXCPP_MBEDTLS_FLAGS" />
+
+			<section unless="HAS_HXCPP_MBEDTLS_FLAGS">
+
+				<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>
 
 		</section>
 
diff --git a/templates/cpp/static/BuildMain.xml b/templates/cpp/static/BuildMain.xml
index f49c7e5c8..6813ce32d 100644
--- a/templates/cpp/static/BuildMain.xml
+++ b/templates/cpp/static/BuildMain.xml
@@ -2,7 +2,9 @@
 
 	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
 
-	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" />
+	<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
+	<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
 
 	<files id="main">
 
@@ -13,7 +15,8 @@
 	<target id="main" output="Main${DBG}" tool="linker" toolid="exe">
 
 		<files id="main" />
-		<files id="hxcpp_ssl" />
+		<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
+		<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
 		::foreach ndlls::
 		<lib name="::path::" />::end::
 
diff --git a/templates/ios/template/{{app.file}}/haxe/BuildHxcppMbedtls.xml b/templates/ios/template/{{app.file}}/haxe/BuildHxcppMbedtls.xml
index f55252a1d..5c2ddf007 100644
--- a/templates/ios/template/{{app.file}}/haxe/BuildHxcppMbedtls.xml
+++ b/templates/ios/template/{{app.file}}/haxe/BuildHxcppMbedtls.xml
@@ -1,11 +1,14 @@
 <xml>
 
-	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
-	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" />
+	<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
+	<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
+	<include name="${HXCPP}/build-tool/BuildCommon.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
 
 	<target id="default" output="libmbedtls_hxcpp${DBG}" tool="linker" toolid="static_link">
 
-		<files id="hxcpp_ssl" />
+		<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
+		<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
 
 	</target>
 
diff --git a/templates/tvos/PROJ/haxe/BuildHxcppMbedtls.xml b/templates/tvos/PROJ/haxe/BuildHxcppMbedtls.xml
index f55252a1d..5c2ddf007 100644
--- a/templates/tvos/PROJ/haxe/BuildHxcppMbedtls.xml
+++ b/templates/tvos/PROJ/haxe/BuildHxcppMbedtls.xml
@@ -1,11 +1,14 @@
 <xml>
 
-	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
-	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" />
+	<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" />
+	<set name="HAS_HXCPP_MBEDTLS_FILES" value="1" if="MBEDTLS_DIR" />
+	<include name="${HXCPP}/build-tool/BuildCommon.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
+	<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="HAS_HXCPP_MBEDTLS_FILES" />
 
 	<target id="default" output="libmbedtls_hxcpp${DBG}" tool="linker" toolid="static_link">
 
-		<files id="hxcpp_ssl" />
+		<files id="mbedtls" if="HAS_HXCPP_MBEDTLS_FILES" />
+		<files id="hxcpp_ssl" unless="HAS_HXCPP_MBEDTLS_FILES" />
 
 	</target>