Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Link against hxcpp's mbedtls in static builds #1818

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Link against hxcpp's mbedtls in static builds #1818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0df09bc
Link against hxcpp's mbedtls in static builds
tobil4sk Jul 11, 2024
6377cce
Support hxcpp older than 4.3.0 for mbedtls linking
tobil4sk Jul 12, 2024
13903b7
Update curl submodule
tobil4sk Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion project/lib/curl
Open in desktop
Submodule curl updated 2226 files
22 changes: 17 additions & 5 deletions project/lib/curl-files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand All @@ -23,7 +24,16 @@
<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="-I${this_dir}/custom/mbedtls_hxcpp" />
<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;" />

</section>

<compilerflag value="-DBUILDING_LIBCURL" />
<compilerflag value="-DCURL_STATICLIB" />
Expand All @@ -41,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" />
Expand All @@ -58,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" />
Expand All @@ -76,19 +85,20 @@
<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" />
<file name="${NATIVE_TOOLKIT_PATH}/curl/lib/getenv.c" />
<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" />
Expand All @@ -103,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" />
Expand All @@ -113,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" />
Expand Down Expand Up @@ -167,4 +179,4 @@

</files>

</xml>
</xml>
Empty file added project/lib/custom/mbedtls_hxcpp/mbedtls_config.h
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions templates/cpp/static/BuildMain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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::

Expand All @@ -35,6 +38,7 @@
<lib name="rpcrt4.lib" />
<lib name="dwrite.lib" />
<lib name="setupapi.lib" />
<lib name="crypt32.lib" />

</section>

Expand Down
Loading