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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1403153002: skia: Fix command buffer support on the mac (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix merge error Created 5 years, 1 month 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/gl/command_buffer/SkCommandBufferGLContext.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 5
6 # conditions used in both common.gypi and skia.gyp in chromium 6 # conditions used in both common.gypi and skia.gyp in chromium
7 # 7 #
8 { 8 {
9 'defines': [ 9 'defines': [
10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 ], 610 ],
611 }, 611 },
612 ], 612 ],
613 613
614 [ 'skia_moz2d', { 614 [ 'skia_moz2d', {
615 'defines': [ 615 'defines': [
616 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d 616 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
617 ], 617 ],
618 }], 618 }],
619 619
620 [ 'skia_command_buffer', { 620 [ 'skia_command_buffer and skia_os == "linux"', {
621 'ldflags': [ 621 'ldflags': [
622 '-Wl,-rpath,\$$ORIGIN/lib', 622 '-Wl,-rpath,\$$ORIGIN/lib',
623 ], 623 ],
624 }], 624 }],
625 625
626 [ 'skia_command_buffer and skia_os == "mac"', {
627 'xcode_settings': {
628 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'],
629 },
630 }],
631
626 ], # end 'conditions' 632 ], # end 'conditions'
627 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 633 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
628 'xcode_settings': { 634 'xcode_settings': {
629 'SYMROOT': '<(DEPTH)/xcodebuild', 635 'SYMROOT': '<(DEPTH)/xcodebuild',
630 }, 636 },
631 } 637 }
OLDNEW
« no previous file with comments | « no previous file | src/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698