Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Target for building freetype. | 1 # Target for building freetype. |
| 2 { | 2 { |
| 3 'targets': [ | 3 'targets': [ |
| 4 { | 4 { |
| 5 'target_name': 'freetype', | 5 'target_name': 'freetype', |
| 6 'type': 'none', | 6 'type': 'none', |
| 7 'conditions': [ | 7 'conditions': [ |
| 8 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { | 8 [ 'skia_freetype_static', |
| 9 'direct_dependent_settings': { | 9 { |
| 10 'include_dirs' : [ | 10 'dependencies': [ |
| 11 '/usr/include/freetype2', | 11 'freetype_static' |
| 12 ], | 12 ], |
| 13 'link_settings': { | 13 'export_dependent_settings': [ |
| 14 'libraries': [ | 14 'freetype_static' |
| 15 '-lfreetype', | 15 ], |
| 16 'direct_dependent_settings': { | |
| 17 'defines': [ | |
| 18 # Both Android and NaCl provide at least FreeType 2.4.0 | |
|
scroggo
2014/02/24 17:51:40
Like you've done with the rest of the linux define
hal.canary
2014/02/24 18:57:51
Done.
| |
| 19 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', | |
| 20 'SK_CAN_USE_DLOPEN=0', | |
| 16 ], | 21 ], |
| 17 'defines': [ | 22 }, |
| 18 #The font host requires at least FreeType 2.3.0 at runtime. | 23 }, { # (not skia_freetype_static) |
| 19 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300',\ | 24 # dynamic linking depends on the OS: |
| 20 'SK_CAN_USE_DLOPEN=1', | 25 'conditions': [ |
| 26 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos "]', | |
| 27 { | |
| 28 'direct_dependent_settings': { | |
| 29 'include_dirs' : [ | |
| 30 '/usr/include/freetype2', | |
| 31 ], | |
| 32 'link_settings': { | |
| 33 'libraries': [ | |
| 34 '-lfreetype', | |
| 35 ], | |
| 36 }, | |
| 37 'defines': [ | |
| 38 # The font host requires at least FreeType 2.3.0 | |
| 39 # at runtime. | |
| 40 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020300', | |
| 41 'SK_CAN_USE_DLOPEN=1', | |
| 42 ], | |
| 43 } | |
| 44 }, | |
| 21 ], | 45 ], |
| 22 } | 46 [ 'skia_android_framework', |
| 23 }, | 47 { |
| 24 }], | 48 'direct_dependent_settings': { |
| 25 [ 'skia_os in ["android", "nacl"]', { | 49 'defines': [ |
| 26 'dependencies': [ | 50 # Both Android provides at least FreeType 2.4.0 |
| 27 'freetype_static' | 51 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', |
| 28 ], | 52 'SK_CAN_USE_DLOPEN=0', |
| 29 'export_dependent_settings': [ | 53 ], |
| 30 'freetype_static' | 54 }, |
| 31 ], | 55 'include_dirs': [ |
| 32 'direct_dependent_settings': { | 56 'external/expat/lib', |
| 33 'defines': [ | 57 'external/freetype/include', |
| 34 # Both Android and NaCl provide at least FreeType 2.4.0 | 58 ], |
| 35 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', | 59 'libraries': [ |
| 36 'SK_CAN_USE_DLOPEN=0', | 60 '-lft2', |
| 61 ], | |
| 62 # Remove these, and use the system's freetype instead. | |
|
scroggo
2014/02/24 17:51:40
This comment is no longer needed.
hal.canary
2014/02/24 18:57:51
Done.
| |
| 63 } | |
| 64 ], | |
| 37 ], | 65 ], |
| 38 }, | 66 } |
| 39 }], | 67 ], |
| 40 [ 'skia_android_framework', { | |
| 41 'include_dirs': [ | |
| 42 'external/expat/lib', | |
| 43 'external/freetype/include', | |
| 44 ], | |
| 45 'libraries': [ | |
| 46 '-lft2', | |
| 47 ], | |
| 48 # Remove these, and use the system's freetype instead. | |
| 49 'dependencies!': [ | |
| 50 'freetype_static', | |
| 51 ], | |
| 52 'export_dependent_settings!': [ | |
| 53 'freetype_static', | |
| 54 ] | |
| 55 }], | |
| 56 ], | 68 ], |
| 57 }, | 69 }, |
| 58 { | 70 { |
| 59 'target_name': 'freetype_static', | 71 'target_name': 'freetype_static', |
| 60 'type': 'static_library', | 72 'type': 'static_library', |
| 61 'standalone_static_library': 1, | 73 'standalone_static_library': 1, |
| 62 'dependencies': [ | 74 'dependencies': [ |
| 63 # we are dependent upon PNG for color emoji glyphs | 75 # we are dependent upon PNG for color emoji glyphs |
| 64 'images.gyp:images' | 76 'libpng.gyp:libpng', |
| 65 ], | 77 ], |
| 66 'includes': [ | 78 'includes': [ |
| 67 # common freetype sources needed for both the base Skia build and the | 79 # common freetype sources needed for both the base Skia build and the |
| 68 # libpoppler build for testing only | 80 # libpoppler build for testing only |
| 69 'freetype.gypi', | 81 'freetype.gypi', |
| 70 ], | 82 ], |
| 71 'include_dirs': [ | 83 'include_dirs': [ |
| 72 '../third_party/freetype/include_overrides', | 84 '../third_party/freetype/include_overrides', |
| 73 ], | 85 ], |
| 74 'direct_dependent_settings': { | 86 'direct_dependent_settings': { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 112 '../third_party/externals/freetype/src/type1/type1.c', | 124 '../third_party/externals/freetype/src/type1/type1.c', |
| 113 '../third_party/externals/freetype/src/type42/type42.c', | 125 '../third_party/externals/freetype/src/type42/type42.c', |
| 114 '../third_party/externals/freetype/src/winfonts/winfnt.c', | 126 '../third_party/externals/freetype/src/winfonts/winfnt.c', |
| 115 | 127 |
| 116 '../third_party/externals/freetype/src/gzip/ftgzip.c', | 128 '../third_party/externals/freetype/src/gzip/ftgzip.c', |
| 117 '../third_party/externals/freetype/src/lzw/ftlzw.c', | 129 '../third_party/externals/freetype/src/lzw/ftlzw.c', |
| 118 ], | 130 ], |
| 119 }, | 131 }, |
| 120 ], | 132 ], |
| 121 } | 133 } |
| OLD | NEW |