Link against hxcpp's mbedtls in static builds

This avoids lime's mbedtls overwriting hxcpp's, which has caused issues
in the past.
This commit is contained in:
Tobiasz Laskowski
2024-07-11 19:53:51 +01:00
committed by Josh Tynjala
parent d1db9e88af
commit 22fb016d95
3 changed files with 14 additions and 2 deletions

View File

@@ -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" />

View File

@@ -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" />

View File

@@ -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::