Skip to content

Commit e674137

Browse files
ACrazyTownACrazyTown
committed
Merge remote-tracking branch 'upstream/8.3.0-Dev' into cool
2 parents 4848933 + fc58879 commit e674137

40 files changed

+682
-289
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ jobs:
117117
rm /usr/local/bin/idle3*
118118
rm /usr/local/bin/pydoc3*
119119
rm /usr/local/bin/python3*
120+
rm /usr/local/bin/pip3*
120121
brew bundle
121122
popd
122123

‎CONTRIBUTING.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,24 @@ You may consider creating a branch specific to the fix or improvement you wish t
1616

1717
It is our goal to help Lime evolve as a clean, easy-to-use (but powerful) layer for cross-platform development. Thanks for being a part of making this possible!
1818

19+
## Versioning and Branching Guidelines
20+
21+
We follow Semantic Versioning (semver): MAJOR.MINOR.PATCH.
22+
23+
### Patch Updates (x.x.x)
24+
25+
All bug fixes should be submitted to the current stable development branch (e.g., develop).
26+
27+
These changes are released as patch versions (e.g., 8.2.3 → 8.2.4).
28+
29+
### Minor Updates (x.x.0)
30+
31+
All new features (non-breaking) should be submitted to the next minor development branch, named x.x.x-dev.
32+
33+
For example, if the current version is 8.2.2, features targeting 8.3.0 should go into 8.3.0-dev.
34+
35+
### Major Updates (x.0.0)
36+
37+
Any breaking changes or major version updates must be submitted to the next major development branch, named x.0.0-dev.
38+
39+
For example, breaking changes intended for 9.0.0 go into 9.0.0-dev.

‎include.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<define name="lime-howlerjs" if="html5" />
2020
<define name="lime-html5" if="html5" />
2121
<define name="lime-native" if="native" />
22-
<define name="lime-openal" unless="lime-console || flash || html5" />
23-
<define name="lime-openalsoft" if="lime-openal" unless="ios || tvos || static_link" />
24-
<define name="lime-mojoal" if="lime-openal" unless="ios || tvos || lime-openalsoft" />
22+
<define name="lime-openalsoft" if="windows || linux || mac || android" unless="static_link || lime-mojoal || winrt" />
23+
<define name="lime-mojoal" if="lime-switch || static_link || winrt" unless="lime-openalsoft" />
24+
<define name="lime-openal" if="ios || tvos || emscripten || lime-openalsoft || lime-mojoal" />
2525
<define name="lime-opengl" if="desktop" unless="html5" />
2626
<define name="lime-opengles" if="emscripten || mobile" />
2727
<define name="lime-vorbis" if="native" />

‎project/Build.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@
2323
<set name="LIME_MBEDTLS" value="1" unless="emscripten || winrt" />
2424
<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
2525
<set name="LIME_OGG" value="1" />
26-
<set name="LIME_OPENALSOFT" value="1" if="windows || linux || mac || android" unless="static_link" />
27-
<set name="LIME_OPENAL" value="1" if="iphone || webassembly || tvos" />
28-
<set name="LIME_MOJOAL" value="1" if="switch || static_link || winrt || mojoal" unless="LIME_OPENAL" />
29-
<unset name="LIME_OPENALSOFT" if="LIME_MOJOAL" />
30-
<set name="LIME_OPENAL" value="1" if="LIME_OPENALSOFT" />
31-
<set name="LIME_OPENAL" value="1" if="LIME_MOJOAL" />
26+
<set name="LIME_OPENALSOFT" value="1" if="lime-openalsoft" />
27+
<set name="LIME_OPENAL" value="1" if="lime-openal" />
28+
<set name="LIME_MOJOAL" value="1" if="lime-mojoal" />
3229
<set name="LIME_OPENGL" value="1" />
3330
<set name="LIME_PIXMAN" value="1" />
3431
<set name="LIME_PNG" value="1" />
@@ -58,6 +55,8 @@
5855

5956
<files id="lime">
6057

58+
<!-- setting HXCPP_CPP11 doesn't seem to apply to .mm files -->
59+
<compilerflag value="-std=c++11" unless="isMsvc" />
6160
<compilerflag value="-Iinclude" />
6261

6362
<file name="src/ExternalInterface.cpp" />

‎project/BuildHashlink.xml‎

Lines changed: 42 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
<set name="ios" value="1" if="iphone" />
88
<set name="tvos" value="1" if="appletv" />
99

10+
<set name="NATIVE_TOOLKIT_PATH" value="lib" unless="NATIVE_TOOLKIT_PATH"/>
1011
<set name="HASHLINK_PATH" value="lib/hashlink" unless="HASHLINK_PATH" />
1112

13+
<include name="lib/mbedtls-files.xml"/>
14+
1215
<files id="hl">
1316
<compilerflag value="-I${HASHLINK_PATH}/src" />
1417

@@ -24,6 +27,8 @@
2427
<files id="libhl">
2528
<compilerflag value="-std=c11" unless="windows" />
2629
<compilerflag value="-DLIBHL_EXPORTS" />
30+
<compilerflag value="-DHAVE_CONFIG_H" />
31+
<compilerflag value="-DPCRE2_CODE_UNIT_WIDTH=16" />
2732

2833
<compilerflag value="-I${HASHLINK_PATH}/src" />
2934
<compilerflag value="-I${HASHLINK_PATH}/include" />
@@ -56,19 +61,34 @@
5661
<file name="${HASHLINK_PATH}/src/std/ucs2.c" />
5762

5863
<!-- PCRE -->
59-
<file name="${HASHLINK_PATH}/include/pcre/pcre16_ord2utf16.c" />
60-
<file name="${HASHLINK_PATH}/include/pcre/pcre_globals.c" />
61-
<file name="${HASHLINK_PATH}/include/pcre/pcre16_valid_utf16.c" />
62-
<file name="${HASHLINK_PATH}/include/pcre/pcre_newline.c" />
63-
<file name="${HASHLINK_PATH}/include/pcre/pcre_chartables.c" />
64-
<file name="${HASHLINK_PATH}/include/pcre/pcre_string_utils.c" />
65-
<file name="${HASHLINK_PATH}/include/pcre/pcre_compile.c" />
66-
<file name="${HASHLINK_PATH}/include/pcre/pcre_tables.c" />
67-
<file name="${HASHLINK_PATH}/include/pcre/pcre_dfa_exec.c" />
68-
<file name="${HASHLINK_PATH}/include/pcre/pcre_ucd.c" />
69-
<file name="${HASHLINK_PATH}/include/pcre/pcre_exec.c" />
70-
<file name="${HASHLINK_PATH}/include/pcre/pcre_xclass.c" />
71-
<file name="${HASHLINK_PATH}/include/pcre/pcre_fullinfo.c" />
64+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_auto_possess.c"/>
65+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_chartables.c"/>
66+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_compile.c"/>
67+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_config.c"/>
68+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_context.c"/>
69+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_convert.c"/>
70+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_dfa_match.c"/>
71+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_error.c"/>
72+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_extuni.c"/>
73+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_find_bracket.c"/>
74+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_jit_compile.c"/>
75+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_maketables.c"/>
76+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_match.c"/>
77+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_match_data.c"/>
78+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_newline.c"/>
79+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_ord2utf.c"/>
80+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_pattern_info.c"/>
81+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_script_run.c"/>
82+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_serialize.c"/>
83+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_string_utils.c"/>
84+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_study.c"/>
85+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_substitute.c"/>
86+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_substring.c"/>
87+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_tables.c"/>
88+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_ucd.c"/>
89+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_ucptables.c"/>
90+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_valid_utf.c"/>
91+
<file name="${HASHLINK_PATH}/include/pcre/pcre2_xclass.c"/>
7292

7393
<!-- macOS debugging -->
7494
<file name="${HASHLINK_PATH}/include/mdbg/mdbg.c" if="mac" />
@@ -78,84 +98,15 @@
7898

7999
<files id="ssl">
80100
<compilerflag value="-I${HASHLINK_PATH}/src" />
81-
<compilerflag value="-I${HASHLINK_PATH}/include/mbedtls/include" />
82-
101+
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/hl-ssl" />
102+
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" />
103+
<compilerflag value="-D_UNICODE" if="windows"/>
104+
<compilerflag value="-DUNICODE" if="windows"/>
105+
<compilerflag value="-DMBEDTLS_THREADING_C"/>
106+
<compilerflag value="-DMBEDTLS_THREADING_PTHREAD" unless="windows"/>
107+
<compilerflag value="-DMBEDTLS_THREADING_ALT" if="windows"/>
108+
<compilerflag value="/std:c11" if="windows"/>
83109
<file name="${HASHLINK_PATH}/libs/ssl/ssl.c" />
84-
85-
<compilerflag value="-I/usr/local/include" if="mac"/>
86-
87-
<section if="windows">
88-
<file name="${HASHLINK_PATH}/include/mbedtls/library/aes.c" />
89-
<file name="${HASHLINK_PATH}/include/mbedtls/library/aesni.c" />
90-
<file name="${HASHLINK_PATH}/include/mbedtls/library/arc4.c" />
91-
<file name="${HASHLINK_PATH}/include/mbedtls/library/asn1parse.c" />
92-
<file name="${HASHLINK_PATH}/include/mbedtls/library/asn1write.c" />
93-
<file name="${HASHLINK_PATH}/include/mbedtls/library/base64.c" />
94-
<file name="${HASHLINK_PATH}/include/mbedtls/library/bignum.c" />
95-
<file name="${HASHLINK_PATH}/include/mbedtls/library/blowfish.c" />
96-
<file name="${HASHLINK_PATH}/include/mbedtls/library/camellia.c" />
97-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ccm.c" />
98-
<file name="${HASHLINK_PATH}/include/mbedtls/library/certs.c" />
99-
<file name="${HASHLINK_PATH}/include/mbedtls/library/cipher.c" />
100-
<file name="${HASHLINK_PATH}/include/mbedtls/library/cipher_wrap.c" />
101-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ctr_drbg.c" />
102-
<file name="${HASHLINK_PATH}/include/mbedtls/library/debug.c" />
103-
<file name="${HASHLINK_PATH}/include/mbedtls/library/des.c" />
104-
<file name="${HASHLINK_PATH}/include/mbedtls/library/dhm.c" />
105-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecdh.c" />
106-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecdsa.c" />
107-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecjpake.c" />
108-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecp.c" />
109-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecp_curves.c" />
110-
<file name="${HASHLINK_PATH}/include/mbedtls/library/entropy.c" />
111-
<file name="${HASHLINK_PATH}/include/mbedtls/library/entropy_poll.c" />
112-
<file name="${HASHLINK_PATH}/include/mbedtls/library/error.c" />
113-
<file name="${HASHLINK_PATH}/include/mbedtls/library/gcm.c" />
114-
<file name="${HASHLINK_PATH}/include/mbedtls/library/havege.c" />
115-
<file name="${HASHLINK_PATH}/include/mbedtls/library/hmac_drbg.c" />
116-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md.c" />
117-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md2.c" />
118-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md4.c" />
119-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md5.c" />
120-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md_wrap.c" />
121-
<file name="${HASHLINK_PATH}/include/mbedtls/library/memory_buffer_alloc.c" />
122-
<file name="${HASHLINK_PATH}/include/mbedtls/library/oid.c" />
123-
<file name="${HASHLINK_PATH}/include/mbedtls/library/padlock.c" />
124-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pem.c" />
125-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pk.c" />
126-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs11.c" />
127-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs12.c" />
128-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs5.c" />
129-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkparse.c" />
130-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkwrite.c" />
131-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pk_wrap.c" />
132-
<file name="${HASHLINK_PATH}/include/mbedtls/library/platform.c" />
133-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ripemd160.c" />
134-
<file name="${HASHLINK_PATH}/include/mbedtls/library/rsa.c" />
135-
<file name="${HASHLINK_PATH}/include/mbedtls/library/rsa_internal.c" />
136-
<file name="${HASHLINK_PATH}/include/mbedtls/library/sha1.c" />
137-
<file name="${HASHLINK_PATH}/include/mbedtls/library/sha256.c" />
138-
<file name="${HASHLINK_PATH}/include/mbedtls/library/sha512.c" />
139-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cache.c" />
140-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_ciphersuites.c" />
141-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cli.c" />
142-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cookie.c" />
143-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_srv.c" />
144-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_ticket.c" />
145-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_tls.c" />
146-
<file name="${HASHLINK_PATH}/include/mbedtls/library/threading.c" />
147-
<file name="${HASHLINK_PATH}/include/mbedtls/library/timing.c" />
148-
<file name="${HASHLINK_PATH}/include/mbedtls/library/version.c" />
149-
<file name="${HASHLINK_PATH}/include/mbedtls/library/version_features.c" />
150-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509.c" />
151-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509write_crt.c" />
152-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509write_csr.c" />
153-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_create.c" />
154-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_crl.c" />
155-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_crt.c" />
156-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_csr.c" />
157-
<file name="${HASHLINK_PATH}/include/mbedtls/library/xtea.c" />
158-
</section>
159110
</files>
160111

161112
<files id="mysql">
@@ -371,6 +322,7 @@
371322
<outdir name="${OUTPUT_DIR}/${BINDIR}" />
372323
<ext value=".hdll" />
373324
<files id="ssl" />
325+
<files id="native-toolkit-mbedtls"/>
374326

375327
<vflag name="-install_name" value="@executable_path/ssl.hdll" if="mac"/>
376328

@@ -383,13 +335,6 @@
383335
<lib name="Crypt32.lib" if="windows" />
384336
<lib name="ws2_32.lib" if="windows" />
385337

386-
<!-- Find homebrews mbedtls -->
387-
<lib name="-L/usr/local/lib" if="mac" />
388-
389-
<lib name="-lmbedtls" unless="windows" />
390-
<lib name="-lmbedx509" unless="windows" />
391-
<lib name="-lmbedcrypto" unless="windows" />
392-
393338
<vflag name="-framework" value="Security" if="mac || ios || tvos" />
394339
<vflag name="-framework" value="CoreFoundation" if="mac || ios || tvos" />
395340
</target>

‎project/include/text/Font.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ namespace lime {
5656
int GetNumGlyphs ();
5757
int GetUnderlinePosition ();
5858
int GetUnderlineThickness ();
59+
int GetStrikethroughPosition ();
60+
int GetStrikethroughThickness ();
5961
int GetUnitsPerEM ();
6062
int RenderGlyph (int index, Bytes *bytes, int offset = 0);
6163
int RenderGlyphs (value indices, Bytes *bytes);

‎project/include/ui/Gamepad.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace lime {
1212
static void AddMapping (const char* content);
1313
static const char* GetDeviceGUID (int id);
1414
static const char* GetDeviceName (int id);
15+
static void Rumble (int id, double lowFrequencyRumble, double highFrequencyRumble, int duration);
1516

1617
};
1718

‎project/lib/curl-files.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<xml>
2-
<include name="${HXCPP}/project/thirdparty/mbedtls_files.xml" noerror="true" if="static_link"/>
2+
<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" noerror="true" if="static_link" />
33
<set name="HAS_HXCPP_MBEDTLS_FLAGS" value="1" if="MBEDTLS_DIR" />
44
<include name="${HXCPP}/src/hx/libs/ssl/Build.xml" unless="MBEDTLS_DIR"/>
55

@@ -30,7 +30,7 @@
3030
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" if="NATIVE_TOOLKIT_HAVE_MBEDTLS" unless="static_link"/>
3131
<section if="static_link">
3232

33-
<include name="${HXCPP}/project/thirdparty/mbedtls_flags.xml" if="HAS_HXCPP_MBEDTLS_FLAGS" />
33+
<include name="${HXCPP}/project/thirdparty/mbedtls-flags.xml" if="HAS_HXCPP_MBEDTLS_FLAGS" />
3434

3535
<section unless="HAS_HXCPP_MBEDTLS_FLAGS">
3636

‎project/lib/custom/hl-ssl/threading_alt.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <windows.h>
2+
3+
typedef struct {
4+
CRITICAL_SECTION cs;
5+
char is_valid;
6+
} mbedtls_threading_mutex_t;

‎project/lib/hashlink‎

Submodule hashlink updated 116 files

0 commit comments

Comments
 (0)