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

Side by Side Diff: gyp/gpu.gyp

Issue 1737653002: Update shaderc lib and use single combined lib (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 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 | src/gpu/vk/GrVkProgramBuilder.cpp » ('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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 '../third_party/' # To include files under third_party/vulkan 243 '../third_party/' # To include files under third_party/vulkan
244 ], 244 ],
245 }, 245 },
246 'conditions' : [ 246 'conditions' : [
247 ['skia_os == "win"', { 247 ['skia_os == "win"', {
248 'all_dependent_settings': { 248 'all_dependent_settings': {
249 'msvs_settings': { 249 'msvs_settings': {
250 'VCLinkerTool': { 250 'VCLinkerTool': {
251 'AdditionalDependencies': [ 251 'AdditionalDependencies': [
252 'vulkan-1.lib', 252 'vulkan-1.lib',
253 'shaderc.lib', 253 'shaderc_combined.lib'
254 'shaderc_util.lib',
255 'glslang.lib',
256 'OSDependent.lib',
257 'OGLCompiler.lib',
258 'SPIRV-Tools.lib',
259 'SPIRV.lib',
260 ], 254 ],
261 }, 255 },
262 }, 256 },
263 }, 257 },
264 'link_settings': { 258 'link_settings': {
265 'configurations': { 259 'configurations': {
266 'Debug': { 260 'Debug': {
267 'msvs_settings': { 261 'msvs_settings': {
268 'VCLinkerTool': { 262 'VCLinkerTool': {
269 'AdditionalLibraryDirectories': [ 263 'AdditionalLibraryDirectories': [
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 ], 303 ],
310 }, { 304 }, {
311 'sources!': [ 305 'sources!': [
312 '<@(skgpu_vk_sources)', 306 '<@(skgpu_vk_sources)',
313 ], 307 ],
314 }], 308 }],
315 ], 309 ],
316 }, 310 },
317 ], 311 ],
318 } 312 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/vk/GrVkProgramBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698