OLD | NEW |
---|---|
1 # Target for including zlib. | |
1 { | 2 { |
2 'targets': [ | 3 'targets': [ |
3 { | 4 { |
4 'target_name': 'zlib', | 5 'target_name': 'zlib', |
5 'type': 'static_library', | 6 'type': 'static_library', |
6 'dependencies': [ | 7 'dependencies': [ |
7 'skia_lib.gyp:skia_lib', | 8 'skia_lib.gyp:skia_lib', |
8 ], | 9 ], |
9 'sources': [ | 10 'sources': [ |
10 '../include/core/SkFlate.h', | 11 '../include/core/SkFlate.h', |
(...skipping 12 matching lines...) Expand all Loading... | |
23 [ 'skia_os == "ios"', { | 24 [ 'skia_os == "ios"', { |
24 'link_settings': { | 25 'link_settings': { |
25 'libraries': [ | 26 'libraries': [ |
26 '$(SDKROOT)/usr/lib/libz.dylib', | 27 '$(SDKROOT)/usr/lib/libz.dylib', |
27 ], | 28 ], |
28 }, | 29 }, |
29 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ], | 30 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ], |
30 }], | 31 }], |
31 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "nac l"]', { | 32 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "nac l"]', { |
32 'link_settings': { 'libraries': [ '-lz', ], }, | 33 'link_settings': { 'libraries': [ '-lz', ], }, |
33 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ], | 34 'conditions': [ |
djsollen
2014/01/21 17:47:37
is this condition necessary?
scroggo
2014/01/21 19:10:06
Yes. When I attempt to build the Android framework
| |
35 [ 'skia_android_framework==0', { | |
36 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ], | |
37 }], | |
38 ], | |
39 }], | |
40 [ 'skia_android_framework', { | |
41 'include_dirs': [ | |
42 '$(TOPDIR)external/zlib', | |
43 ], | |
34 }], | 44 }], |
35 ], | 45 ], |
36 }, | 46 }, |
37 ], | 47 ], |
38 } | 48 } |
OLD | NEW |