tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass on libraries in link_settings

Browse Source
This commit is contained in:
Konstantin Käfer
2014-10-29 11:32:54 -04:00
parent 3a5b5e68e9
commit 1d82ae14a4
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gyp/mbgl-ios.gypi
View File

@@ -40,9 +40,11 @@
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ],
},
'libraries': [
'<@(uv_static_libs)',
],
'link_settings': {
'libraries': [
'<@(uv_static_libs)',
],
},
'direct_dependent_settings': {
'include_dirs': [
'../include',

10
gyp/mbgl-linux.gypi
View File

@@ -26,10 +26,12 @@
'include_dirs': [
'../include',
],
'libraries': [
'<@(uv_static_libs)',
'<@(curl_static_libs)',
],
'link_settings': {
'libraries': [
'<@(uv_static_libs)',
'<@(curl_static_libs)',
],
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {

8
gyp/mbgl-osx.gypi
View File

@@ -16,9 +16,11 @@
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ],
},
'libraries': [
'<@(uv_static_libs)',
],
'link_settings': {
'libraries': [
'<@(uv_static_libs)',
],
},
'direct_dependent_settings': {
'include_dirs': [
'../include',

16
gyp/mbgl.gypi
View File

@@ -38,19 +38,19 @@
'include_dirs': [
'../include',
],
'libraries': [
'<@(png_static_libs)',
'<@(uv_static_libs)',
'<@(sqlite3_static_libs)',
'<@(zlib_static_libs)',
],
'link_settings': {
'libraries': [
'<@(png_static_libs)',
'<@(uv_static_libs)',
'<@(sqlite3_static_libs)',
'<@(zlib_static_libs)',
],
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
'OTHER_CFLAGS': [ '<@(cflags)' ],
# Makefile builds don't respect 'libraries' on OS X.
'OTHER_LDFLAGS': [ '>@(_libraries)' ],
},
}, {
'cflags_cc': [ '<@(cflags_cc)' ],