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

Commit 37fa7f5

Browse files
Fraser J. Gordonlivecodeian
authored andcommitted
Fix a Gyp error in libGraphics
Gyp does not allow 'dependencies' blocks inside a 'target_conditions' block; this change moves the conditions out.
1 parent 434a745 commit 37fa7f5

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

libgraphics/libgraphics.gyp

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,21 @@
4848
'src/drawing.cpp',
4949
],
5050

51+
'conditions':
52+
[
53+
[
54+
'OS in ("emscripten", "android")',
55+
{
56+
'dependencies':
57+
[
58+
'../prebuilt/libicu.gyp:libicu',
59+
'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
60+
'../thirdparty/libharfbuzz/libharfbuzz.gyp:libharfbuzz',
61+
],
62+
},
63+
],
64+
],
65+
5166
'target_conditions':
5267
[
5368
[
@@ -78,17 +93,6 @@
7893
],
7994
},
8095
],
81-
[
82-
'toolset_os == "android" or toolset_os == "emscripten"',
83-
{
84-
'dependencies':
85-
[
86-
'../prebuilt/libicu.gyp:libicu',
87-
'../thirdparty/libfreetype/libfreetype.gyp:libfreetype',
88-
'../thirdparty/libharfbuzz/libharfbuzz.gyp:libharfbuzz',
89-
],
90-
},
91-
],
9296
],
9397

9498
'direct_dependent_settings':

0 commit comments

Comments
 (0)