Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Merge develop 9.0 24.07.18 #118

Merged
merged 10 commits into from
Jul 24, 2018
Merged

Merge develop 9.0 24.07.18 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81f8010
Ensure thirdparty libs use host/target vars appropriately
livecodefraser Oct 17, 2017
bd35a20
Split Skia optimisations into armv6/armv7
livecodefraser Oct 17, 2017
fe2f67c
Fix Android and Emscripten compilation issues
livecodefraser Dec 22, 2017
41cd45f
Patch the libffi source to fix an obsolete opcode
livecodefraser Dec 22, 2017
50df204
Use ARM instruction encoding if building Skia for ARMv6
livecodefraser Dec 22, 2017
4bed473
Ensure NEON instructions are enabled when building Skia
livecodefraser Dec 22, 2017
a0d5511
Add Linux/Android ARM64 support to our libffi config
livecodefraser Dec 22, 2017
45d6601
Fix the MySQL configuration for 64-bit Android
livecodefraser Dec 22, 2017
816d2af
Merge pull request #116 from livecodeian/feature-android-armv7
livecodeali Jun 26, 2018
624144a
Merge remote-tracking branch 'origin/develop-9.0' into merge-develop_…
livecodeali Jul 24, 2018
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
20 changes: 15 additions & 5 deletions libcef/libcef.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
{
'target_name': 'libcef_library_wrapper',
'type': 'static_library',

'toolsets': ['host', 'target'],

'variables':
{
Expand All @@ -17,16 +19,22 @@
},

# OSX, Windows and Linux only
'conditions':
'target_conditions':
[
[
'OS != "mac" and OS != "win" and OS != "linux"',
'not toolset_os in ("mac", "win", "linux")',
{
'type': 'none',
},
],
[
'OS == "win"',
'toolset_os == "linux" and not toolset_arch in ("x86", "x86_64")',
{
'type': 'none',
},
],
[
'toolset_os == "win"',
{
'defines':
[
Expand Down Expand Up @@ -262,17 +270,19 @@
'target_name': 'libcef_stubs',
'type': 'static_library',

'toolsets': ['host', 'target'],

'variables':
{
'library_for_module': 1,
'silence_warnings': 1,
},

# OSX, Windows and Linux only
'conditions':
'target_conditions':
[
[
'OS != "mac" and OS != "win" and OS != "linux"',
'not toolset_os in ("mac", "win", "linux")',
{
'type': 'none',
},
Expand Down
6 changes: 4 additions & 2 deletions libexpat/libexpat.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
{
'target_name': 'libexpat',
'type': 'static_library',

'toolsets': ['host', 'target'],

'variables':
{
Expand Down Expand Up @@ -58,10 +60,10 @@
],
},

'conditions':
'target_conditions':
[
[
'OS != "android"',
'toolset_os != "android"',
{
'type': 'none',
},
Expand Down
Loading