Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: gyp/nanomsg.gyp

Issue 439333002: small skia_shared_lib=1 build fix for cross-process picture demo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'skia_warnings_as_errors': 0, 3 'skia_warnings_as_errors': 0,
4 }, 4 },
5 'targets': [{ 5 'targets': [{
6 # Draws pictures cross-process. 6 # Draws pictures cross-process.
7 'target_name': 'nanomsg_picture_demo', 7 'target_name': 'nanomsg_picture_demo',
8 'type': 'executable', 8 'type': 'executable',
9 'dependencies': [ 9 'dependencies': [
10 'skia_lib.gyp:skia_lib', 10 'skia_lib.gyp:skia_lib',
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 '../third_party/externals/nanomsg/src/utils/stopwatch.c', 108 '../third_party/externals/nanomsg/src/utils/stopwatch.c',
109 '../third_party/externals/nanomsg/src/utils/thread.c', 109 '../third_party/externals/nanomsg/src/utils/thread.c',
110 '../third_party/externals/nanomsg/src/utils/wire.c', 110 '../third_party/externals/nanomsg/src/utils/wire.c',
111 ], 111 ],
112 112
113 # TODO(mtklein): Support Windows? 113 # TODO(mtklein): Support Windows?
114 # To refresh: cd third_party/externals/nanomsg; ./autogen.sh; ./configure; c opy from Makefile. 114 # To refresh: cd third_party/externals/nanomsg; ./autogen.sh; ./configure; c opy from Makefile.
115 'conditions': [ 115 'conditions': [
116 ['skia_os == "linux"', { 116 ['skia_os == "linux"', {
117 'cflags': [ '-Wno-missing-field-initializers' ], 117 'cflags': [ '-Wno-missing-field-initializers' ],
118 'libraries': [ '-lanl' ], # Provides getaddrinfo_a and co. 118 'libraries': [
119 '-lpthread',
120 '-lanl', # Provides getaddrinfo_a and co.
121 ],
119 'direct_dependent_settings': { 122 'direct_dependent_settings': {
120 'libraries': [ '-lanl' ], 123 'libraries': [ '-lpthread', '-lanl' ],
121 }, 124 },
122 'defines=': [ # equals sign throws away most Skia defines (j ust noise) 125 'defines=': [ # equals sign throws away most Skia defines (j ust noise)
123 'HAVE_ACCEPT4', 126 'HAVE_ACCEPT4',
124 'HAVE_ARPA_INET_H', 127 'HAVE_ARPA_INET_H',
125 'HAVE_CLOCK_GETTIME', 128 'HAVE_CLOCK_GETTIME',
126 'HAVE_DLFCN_H', 129 'HAVE_DLFCN_H',
127 'HAVE_EPOLL_CREATE', 130 'HAVE_EPOLL_CREATE',
128 'HAVE_EVENTFD', 131 'HAVE_EVENTFD',
129 'HAVE_GETIFADDRS', 132 'HAVE_GETIFADDRS',
130 'HAVE_INTTYPES_H', 133 'HAVE_INTTYPES_H',
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 'NN_USE_IFADDRS', 198 'NN_USE_IFADDRS',
196 'NN_USE_KQUEUE', 199 'NN_USE_KQUEUE',
197 'NN_USE_PIPE', 200 'NN_USE_PIPE',
198 'STDC_HEADERS', 201 'STDC_HEADERS',
199 '_THREAD_SAFE', 202 '_THREAD_SAFE',
200 ], 203 ],
201 }], 204 }],
202 ] 205 ]
203 }] 206 }]
204 } 207 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698