kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade cURL and axTLS, initial integration of mbedTLS

Browse Source
This commit is contained in:
Joshua Granick
2017-11-07 15:33:41 -08:00
parent cf5a5ae0e7
commit e08aa05dd3
6 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/Build.xml
View File

@@ -9,7 +9,7 @@
<set name="ios" value="1" if="iphone" />
<set name="tvos" value="1" if="appletv" />
<set name="LIME_AXTLS" value="1" unless="emscripten" />
<set name="LIME_AXTLS" value="1" unless="emscripten || mac" />
<set name="LIME_CAIRO" value="1" />
<set name="LIME_CURL" value="1" unless="emscripten" />
<set name="LIME_EFSW" value="1" if="windows || mac || linux" />
@@ -17,6 +17,7 @@
<set name="LIME_FREETYPE" value="1" />
<set name="LIME_HARFBUZZ" value="1" />
<set name="LIME_LZMA" value="1" />
<set name="LIME_MBEDTLS" value="1" if="mac" />
<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
<set name="LIME_OGG" value="1" />
<set name="LIME_OPENALSOFT" value="1" if="windows || linux || android" unless="static_link" />
@@ -39,6 +40,7 @@
<set name="NATIVE_TOOLKIT_HAVE_AXTLS" value="1" if="LIME_AXTLS" />
<set name="NATIVE_TOOLKIT_HAVE_HARFBUZZ" value="1" if="LIME_HARFBUZZ" />
<set name="NATIVE_TOOLKIT_HAVE_MBEDTLS" value="1" if="LIME_MBEDTLS" />
<set name="NATIVE_TOOLKIT_HAVE_PNG" value="1" if="LIME_PNG" />
<set name="NATIVE_TOOLKIT_CURL_DISABLE_AXTLS_NONBLOCKING" value="1" />
@@ -300,6 +302,7 @@
<include name="lib/harfbuzz/files.xml" />
<include name="lib/jpeg/files.xml" />
<include name="lib/lzma/files.xml" />
<include name="lib/mbedtls/files.xml" />
<include name="lib/neko/files.xml" />
<include name="lib/ogg/files.xml" />
<include name="lib/openal/files.xml" />
@@ -330,6 +333,7 @@
<files id="native-toolkit-freetype" if="LIME_FREETYPE" />
<files id="native-toolkit-harfbuzz" if="LIME_HARFBUZZ" />
<files id="native-toolkit-lzma" if="LIME_LZMA" />
<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" />
<files id="native-toolkit-neko" if="LIME_NEKO" />
<files id="native-toolkit-ogg" if="LIME_OGG" />
<files id="native-toolkit-openal" if="LIME_OPENALSOFT" />