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

Side by Side Diff: gyp/gpu.gyp

Issue 1757253002: Revert "Pull and build shaderc rather than use checked in lib/header" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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 | « DEPS ('k') | gyp/shaderc.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # GYP for building gpu 5 # GYP for building gpu
6 { 6 {
7 'target_defaults': { 7 'target_defaults': {
8 'conditions': [ 8 'conditions': [
9 ['skia_os != "win"', { 9 ['skia_os != "win"', {
10 'sources/': [ ['exclude', '_win.(h|cpp)$'], 10 'sources/': [ ['exclude', '_win.(h|cpp)$'],
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 'GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1', 228 'GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1',
229 ], 229 ],
230 'link_settings': { 230 'link_settings': {
231 'libraries': [ 231 'libraries': [
232 '-lGLESv2', 232 '-lGLESv2',
233 '-lEGL', 233 '-lEGL',
234 ], 234 ],
235 }, 235 },
236 }], 236 }],
237 [ 'skia_vulkan', { 237 [ 'skia_vulkan', {
238 'dependencies': [
239 'shaderc.gyp:shaderc_combined',
240 ],
241 'include_dirs': [ 238 'include_dirs': [
242 '../third_party/', # To include files under third_party/vulkan 239 '../third_party/' # To include files under third_party/vulkan
243 '../third_party/externals/shaderc/libshaderc/include',
244 ], 240 ],
245 'direct_dependent_settings': { 241 'direct_dependent_settings': {
246 'include_dirs': [ 242 'include_dirs': [
247 '../third_party/', # To include files under third_party/vulkan 243 '../third_party/' # To include files under third_party/vulkan
248 '../third_party/externals/shaderc/libshaderc/include',
249 ], 244 ],
250 }, 245 },
251 'conditions' : [ 246 'conditions' : [
252 ['skia_os == "win"', { 247 ['skia_os == "win"', {
253 'all_dependent_settings': { 248 'all_dependent_settings': {
254 'msvs_settings': { 249 'msvs_settings': {
255 'VCLinkerTool': { 250 'VCLinkerTool': {
256 'AdditionalDependencies': [ 251 'AdditionalDependencies': [
257 'vulkan-1.lib', 252 'vulkan-1.lib',
253 'shaderc_combined.lib'
258 ], 254 ],
259 }, 255 },
260 }, 256 },
261 }, 257 },
262 'link_settings': { 258 'link_settings': {
263 'configurations': { 259 'configurations': {
264 'Debug': { 260 'Debug': {
265 'msvs_settings': { 261 'msvs_settings': {
266 'VCLinkerTool': { 262 'VCLinkerTool': {
267 'AdditionalLibraryDirectories': [ 263 'AdditionalLibraryDirectories': [
268 '../third_party/vulkan', 264 '../third_party/vulkan',
265 '../third_party/shaderc/Debug',
269 ], 266 ],
270 }, 267 },
271 }, 268 },
272 }, 269 },
273 'Release': { 270 'Release': {
274 'msvs_settings': { 271 'msvs_settings': {
275 'VCLinkerTool': { 272 'VCLinkerTool': {
276 'AdditionalLibraryDirectories': [ 273 'AdditionalLibraryDirectories': [
277 '../third_party/vulkan', 274 '../third_party/vulkan',
275 '../third_party/shaderc/Release',
278 ], 276 ],
279 }, 277 },
280 }, 278 },
281 }, 279 },
282 'Debug_x64': { 280 'Debug_x64': {
283 'msvs_settings': { 281 'msvs_settings': {
284 'VCLinkerTool': { 282 'VCLinkerTool': {
285 'AdditionalLibraryDirectories': [ 283 'AdditionalLibraryDirectories': [
286 '../third_party/vulkan', 284 '../third_party/vulkan',
285 '../third_party/shaderc/Debug',
287 ], 286 ],
288 }, 287 },
289 }, 288 },
290 }, 289 },
291 'Release_x64': { 290 'Release_x64': {
292 'msvs_settings': { 291 'msvs_settings': {
293 'VCLinkerTool': { 292 'VCLinkerTool': {
294 'AdditionalLibraryDirectories': [ 293 'AdditionalLibraryDirectories': [
295 '../third_party/vulkan', 294 '../third_party/vulkan',
295 '../third_party/shaderc/Release',
296 ], 296 ],
297 }, 297 },
298 }, 298 },
299 }, 299 },
300 }, 300 },
301 }, 301 },
302 }], 302 }],
303 ], 303 ],
304 }, { 304 }, {
305 'sources!': [ 305 'sources!': [
306 '<@(skgpu_vk_sources)', 306 '<@(skgpu_vk_sources)',
307 ], 307 ],
308 }], 308 }],
309 ], 309 ],
310 }, 310 },
311 ], 311 ],
312 } 312 }
OLDNEW
« no previous file with comments | « DEPS ('k') | gyp/shaderc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698