1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
diff --git a/nss/lib/sqlite/exports.gyp b/nss/lib/sqlite/exports.gyp
index 0a424ba..935b223 100644
--- a/nss/lib/sqlite/exports.gyp
+++ b/nss/lib/sqlite/exports.gyp
@@ -12,7 +12,6 @@
'copies': [
{
'files': [
- 'sqlite3.h'
],
'destination': '<(nss_private_dist_dir)/<(module)'
}
diff --git a/nss/lib/sqlite/sqlite.gyp b/nss/lib/sqlite/sqlite.gyp
index 6a9ab3a..b98ab00 100644
--- a/nss/lib/sqlite/sqlite.gyp
+++ b/nss/lib/sqlite/sqlite.gyp
@@ -10,8 +10,14 @@
'targets': [{
'target_name': 'sqlite3',
'type': 'none',
+ 'direct_dependent_settings': {
+ 'variables': {
+ 'sqlite_include_dirs%': [],
+ },
+ 'include_dirs': ['<@(sqlite_include_dirs)'],
+ },
'link_settings': {
- 'libraries': ['<(sqlite_libs)'],
+ 'libraries': ['<@(sqlite_libs)'],
},
}],
}, {
diff --git a/nss/lib/zlib/zlib.gyp b/nss/lib/zlib/zlib.gyp
index 07df9a8..215732d 100644
--- a/nss/lib/zlib/zlib.gyp
+++ b/nss/lib/zlib/zlib.gyp
@@ -13,6 +13,12 @@
'targets': [{
'target_name': 'nss_zlib',
'type': 'none',
+ 'direct_dependent_settings': {
+ 'variables': {
+ 'zlib_include_dirs%': [],
+ },
+ 'include_dirs': ['<@(zlib_include_dirs)'],
+ },
'link_settings': {
'libraries': ['<@(zlib_libs)'],
},
|
