| Index: gyp/ports.gyp
|
| diff --git a/gyp/ports.gyp b/gyp/ports.gyp
|
| index a62791002a44e60c51e34412079ff33f73ea0e2a..7ecda5f35e6e68c919d483bd51be041c302e709e 100644
|
| --- a/gyp/ports.gyp
|
| +++ b/gyp/ports.gyp
|
| @@ -64,16 +64,29 @@
|
| ],
|
| }],
|
| [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
|
| - 'link_settings': {
|
| - 'libraries': [
|
| - '-lfontconfig',
|
| - '-ldl',
|
| - ],
|
| - },
|
| - 'sources': [
|
| - '../src/fonts/SkFontMgr_fontconfig.cpp',
|
| - '../src/ports/SkFontHost_fontconfig.cpp',
|
| - '../src/ports/SkFontConfigInterface_direct.cpp',
|
| + 'conditions': [
|
| + [ 'skia_no_fontconfig', {
|
| + 'link_settings': {
|
| + 'libraries': [
|
| + '-ldl',
|
| + ],
|
| + },
|
| + 'sources': [
|
| + '../src/ports/SkFontHost_linux.cpp',
|
| + ],
|
| + }, {
|
| + 'link_settings': {
|
| + 'libraries': [
|
| + '-lfontconfig',
|
| + '-ldl',
|
| + ],
|
| + },
|
| + 'sources': [
|
| + '../src/fonts/SkFontMgr_fontconfig.cpp',
|
| + '../src/ports/SkFontHost_fontconfig.cpp',
|
| + '../src/ports/SkFontConfigInterface_direct.cpp',
|
| + ],
|
| + }]
|
| ],
|
| }],
|
| [ 'skia_os == "nacl"', {
|
|
|