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

3
.gitmodules vendored
View File

@@ -55,3 +55,6 @@
[submodule "project/lib/axtls"] [submodule "project/lib/axtls"]
path = project/lib/axtls path = project/lib/axtls
url = https://github.com/native-toolkit/axtls url = https://github.com/native-toolkit/axtls
[submodule "project/lib/mbedtls"]
path = project/lib/mbedtls
url = https://github.com/native-toolkit/mbedtls

7
NOTICE.md
View File

@@ -4,13 +4,13 @@ Notices
### Lime ### Lime
Copyright (c) 2013-2017 Joshua Granick and other Lime contributors Copyright (c) 2013-2017 Joshua Granick and other Lime contributors
This product bundles axTLS 1.4.9, which is available under a This product bundles axTLS 2.1.4, which is available under a
"BSD" license. For details, see [project/lib/axtls/](project/lib). "BSD" license. For details, see [project/lib/axtls/](project/lib).
This product bundles cairo 1.15.2, which is available under an This product bundles cairo 1.15.2, which is available under an
"MPL 1.1" license. For details, see [project/lib/cairo/](project/lib). "MPL 1.1" license. For details, see [project/lib/cairo/](project/lib).
This product bundles libcurl 7.37.1, which is available under an This product bundles libcurl 7.56.1, which is available under an
"MIT/X derivate" license. For details, see [project/lib/curl/](project/lib). "MIT/X derivate" license. For details, see [project/lib/curl/](project/lib).
This product bundles efsw, which is available under an This product bundles efsw, which is available under an
@@ -31,6 +31,9 @@ This product bundles libogg 1.3.0, which is available under a
This product bundles LZMA SDK 4.65, which is available under This product bundles LZMA SDK 4.65, which is available under
public domain. For details, see [project/lib/lzma/](project/lzma). public domain. For details, see [project/lib/lzma/](project/lzma).
This product bundles mbedTLS 2.6.0, which is available under an
"Apache 2.0" license. For details, see [project/lib/mbedtls/](project/lib).
This product bundles OpenAL-Soft 1.17.2, which is available under an This product bundles OpenAL-Soft 1.17.2, which is available under an
"LGPLv3" license. For details, see [project/lib/openal/](project/lib). "LGPLv3" license. For details, see [project/lib/openal/](project/lib).

6
project/Build.xml
View File

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

2
project/lib/axtls

Submodule project/lib/axtls updated: 961447ca2d...69f8aaa0ed

2
project/lib/curl

Submodule project/lib/curl updated: b97ec6d82c...d65a53824c

1
project/lib/mbedtls Submodule

Submodule project/lib/mbedtls added at 2014806c66