Index: gyp/freetype.gyp |
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp |
index 6717c78f65ca01c8e066357771c11b8199cd6e9b..419b55d667b37d2631a6e568addd7810dc897ff9 100644 |
--- a/gyp/freetype.gyp |
+++ b/gyp/freetype.gyp |
@@ -5,24 +5,26 @@ |
'target_name': 'freetype', |
'type': 'none', |
'conditions': [ |
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { |
- 'direct_dependent_settings': { |
- 'include_dirs' : [ |
- '/usr/include/freetype2', |
- ], |
- 'link_settings': { |
- 'libraries': [ |
- '-lfreetype', |
- ], |
- 'defines': [ |
- #The font host requires at least FreeType 2.3.0 at runtime. |
- 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',\ |
- 'SK_CAN_USE_DLOPEN=1', |
+ [ 'skia_freetype_dynamic and not skia_freetype_static', |
borenet
2014/02/18 22:15:36
This stuff is all specific to OS in that list. I'
hal.canary
2014/02/19 15:21:03
done
|
+ { |
+ 'direct_dependent_settings': { |
+ 'include_dirs' : [ |
+ '/usr/include/freetype2', |
], |
- } |
- }, |
- }], |
- [ 'skia_os in ["android", "nacl"]', { |
+ 'link_settings': { |
+ 'libraries': [ |
+ '-lfreetype', |
+ ], |
+ 'defines': [ |
+ #The font host requires at least FreeType 2.3.0 at runtime. |
+ 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300', |
+ 'SK_CAN_USE_DLOPEN=1', |
+ ], |
+ } |
+ }, |
+ } |
+ ], |
+ [ 'skia_freetype_static', { |
'dependencies': [ |
'freetype_static' |
], |
@@ -61,7 +63,7 @@ |
'standalone_static_library': 1, |
'dependencies': [ |
# we are dependent upon PNG for color emoji glyphs |
- 'images.gyp:images' |
+ 'libpng.gyp:libpng', |
], |
'includes': [ |
# common freetype sources needed for both the base Skia build and the |