Skip to content

Commit 7bb4c23

Browse files
livecodepanoslivecodepanos
committed
Merge remote-tracking branch 'upstream/develop-9.6' into merge-develop-9.6-08.06.2021
2 parents d068896 + 7082605 commit 7bb4c23

File tree

83 files changed

+806
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+806
-240
lines changed

‎Installer/package.txt‎

Lines changed: 101 additions & 101 deletions
Large diffs are not rendered by default.

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 10.2 11.2 12.1 13.2 14.4
29-
IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.2 14.4
30-
SKIP_IPHONEOS_VERSIONS ?= 9.2
31-
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2
28+
IPHONEOS_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
29+
IPHONESIMULATOR_VERSIONS ?= 11.2 12.1 13.2 14.4 14.5
30+
SKIP_IPHONEOS_VERSIONS ?= 9.2 10.2
31+
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2 10.2
3232

3333

3434
IOS_SDKS ?= \

‎config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
'x86-android-ndk16r15',
3232
'x86_64-android-ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
34+
'universal-ios-iphoneos14.5',
3435
'universal-ios-iphoneos14.4',
3536
'universal-ios-iphoneos13.2',
3637
'universal-ios-iphoneos12.1',
3738
'universal-ios-iphoneos11.2',
38-
'universal-ios-iphoneos10.2',
39+
'universal-ios-iphonesimulator14.5',
3940
'universal-ios-iphonesimulator14.4',
4041
'universal-ios-iphonesimulator13.2',
4142
'universal-ios-iphonesimulator12.1',
4243
'universal-ios-iphonesimulator11.2',
43-
'universal-ios-iphonesimulator10.2',
4444
'x86-win32', # TODO[2017-03-23] More specific ABI
4545
'x86_64-win32',
4646
'js-emscripten-sdk1.35',

‎config/mac.gypi‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
'STRIP_INSTALLED_PRODUCT': 'NO',
3131
'CLANG_LINK_OBJC_RUNTIME': 'NO',
3232
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
33-
'CLANG_CXX_LIBRARY': 'libc++'
33+
'CLANG_CXX_LIBRARY': 'libc++'
3434
},
3535

3636
'target_defaults':
@@ -47,6 +47,7 @@
4747
'debug_info_suffix': '.dSYM',
4848

4949
'silence_warnings': 0,
50+
'travis': '<!(echo ${TRAVIS})',
5051
},
5152

5253
'target_conditions':
@@ -70,6 +71,21 @@
7071
],
7172
},
7273
],
74+
[
75+
'travis == ""',
76+
{
77+
'xcode_settings':
78+
{
79+
'OTHER_LDFLAGS':
80+
[
81+
'-Wl,-platform_version',
82+
'-Wl,macos',
83+
'-Wl,10.9',
84+
'-Wl,10.9',
85+
],
86+
},
87+
},
88+
],
7389
[
7490
# Non-bundle loadable module should have a .dylib suffix
7591
# and be linked as libraries, not bundles

‎docs/dictionary/command/iphoneAllowBackgroundLocationUpdates.lcdoc‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
Name: iphoneAllowBackgroundLocationUpdates
2+
3+
Type: command
4+
5+
Syntax: iphoneAllowBackgroundLocationUpdates <pAllow>
6+
7+
Summary:
8+
Allows the app to receive location updates when it is suspended
9+
10+
Introduced: 9.6.3
11+
12+
OS: ios
13+
14+
Platforms: mobile
15+
16+
Example:
17+
mobileStartTrackingSensor "location"
18+
iphoneAllowBackgroundLocationUpdates "true"
19+
20+
Example:
21+
iphoneAllowBackgroundLocationUpdates "false"
22+
23+
Parameters:
24+
pAllow (boolean):
25+
A boolean value specifying if the app should continue to receive
26+
location updates when put in the background.
27+
28+
29+
Description:
30+
Use the <iphoneAllowBackgroundLocationUpdates> command to allow (or disallow) the app
31+
receiving location updates when it is suspended.
32+
33+
This command has an effect only if "Location Update" is checked in the
34+
"Background Execution" section in the iOS standalone settings.
35+
36+
37+
38+
References: mobileStartTrackingSensor (command), mobileStopTrackingSensor (command),
39+
40+

‎docs/dictionary/command/replace.lcdoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ replace only an exact <string> of text.
5656
> For example:
5757

5858
put "x:y:y:y:y:x:" into tChangeMe
59-
replace ":y:" with empty in tChangeMe
59+
replace ":y:" with "::" in tChangeMe
6060
put tChangeMe -- returns x::y::y:x
6161

6262
> If the goal were to remove every lone y within two colons that appears

‎docs/dictionary/command/revCloseVideoGrabber.lcdoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Associations: video library
1212

1313
Introduced: 2.0
1414

15+
Deprecated: 9.0
16+
1517
OS: windows
1618

1719
Platforms: desktop

‎docs/dictionary/command/revInitializeVideoGrabber.lcdoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Associations: video library
1111

1212
Introduced: 2.0
1313

14+
Deprecated: 9.0
15+
1416
OS: windows
1517

1618
Platforms: desktop

‎docs/dictionary/command/revSetVideoGrabberRect.lcdoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Associations: video library
1212

1313
Introduced: 2.0
1414

15+
Deprecated: 9.0
16+
1517
OS: windows
1618

1719
Platforms: desktop

‎docs/dictionary/command/revVideoGrabDialog.lcdoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Associations: video library
1111

1212
Introduced: 2.0
1313

14+
Deprecated: 9.0
15+
1416
OS: windows
1517

1618
Platforms: desktop

0 commit comments

Comments
 (0)