Skip to content

Commit 97e3197

Browse files
livecodealilivecodeali
committed
[[ Build ]] Don't rebuild thirdparty libs
This patch splits the thirdparty gyp file into multiple targets - one for each thirdparty library, so that other libraries can depend on particular thirdparty libs. In particular, revxml now depends on the thirdparty prebuilt libxml and libxslt instead of their own gyp files in the thirdparty module. Likewise libffi and its dependencies. The upshot is that these libraries are no longer rebuilt.
1 parent 138724e commit 97e3197

File tree

17 files changed

+1968
-233
lines changed

17 files changed

+1968
-233
lines changed

‎engine/kernel-development.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
'kernel.gyp:kernel',
5151

5252
'../thirdparty/libopenssl/libopenssl.gyp:libopenssl_stubs',
53-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
53+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
5454
],
5555

5656
'sources':

‎engine/kernel-installer.gyp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
'dependencies':
3838
[
3939
'kernel.gyp:kernel',
40-
41-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
40+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
4241
],
4342

4443
'includes':

‎engine/kernel-server.gyp‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,14 @@
5656

5757
'../prebuilt/libcurl.gyp:libcurl',
5858
'../prebuilt/libopenssl.gyp:libopenssl',
59-
60-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
61-
59+
60+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_pcre',
61+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
62+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
63+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
64+
65+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
66+
6267
'engine-common.gyp:quicktime_stubs',
6368

6469
'lcb-modules.gyp:engine_lcb_modules',
@@ -87,11 +92,11 @@
8792
[
8893
'OS == "linux"',
8994
{
90-
'include_dirs':
95+
'dependencies':
9196
[
92-
'../thirdparty/headers/linux/include/cairo',
97+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_cairo',
9398
],
94-
99+
95100
'defines':
96101
[
97102
'PANGO_ENABLE_BACKEND',

‎engine/kernel.gyp‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@
2424

2525
'../prebuilt/libopenssl.gyp:libopenssl_headers',
2626

27-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
27+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_pcre',
28+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
29+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
30+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
31+
32+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
2833

2934
'engine-common.gyp:encode_version',
3035
'engine-common.gyp:quicktime_stubs',
@@ -72,7 +77,12 @@
7277
'src/mblcamera.cpp',
7378
],
7479

75-
80+
'dependencies':
81+
[
82+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
83+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',
84+
],
85+
7686
'link_settings':
7787
{
7888
'ldflags':
@@ -95,6 +105,11 @@
95105
[
96106
'<@(engine_minizip_source_files)',
97107
],
108+
109+
'dependencies':
110+
[
111+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
112+
],
98113
},
99114
],
100115
[

‎libfoundation/libfoundation.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545

4646
'dependencies':
4747
[
48-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
4948
'../prebuilt/libicu.gyp:libicu',
5049
'../prebuilt/libicu.gyp:encode_minimal_icu_data',
50+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_z',
5151
'../thirdparty/libffi/libffi.gyp:libffi',
5252
],
5353

‎libgraphics/libgraphics.gyp‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,28 @@
1414

1515
'dependencies':
1616
[
17-
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt',
17+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_gif',
18+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_png',
19+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_jpeg',
20+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
1821
'../libfoundation/libfoundation.gyp:libFoundation',
1922
],
20-
23+
24+
'conditions':
25+
[
26+
[
27+
'OS in ("emscripten", "android")',
28+
{
29+
'dependencies':
30+
[
31+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',
32+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_harfbuzz',
33+
'../prebuilt/libicu.gyp:libicu',
34+
],
35+
},
36+
],
37+
],
38+
2139
'include_dirs':
2240
[
2341
'include',

‎libscript/libscript.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
'dependencies':
4949
[
5050
'../libfoundation/libfoundation.gyp:libFoundation',
51-
'../thirdparty/libffi/libffi.gyp:libffi',
51+
'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_ffi',
5252
],
5353

5454
'include_dirs':

0 commit comments

Comments
 (0)