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

Side by Side Diff: third_party/mesa/mesa.gyp

Issue 20265003: mesa should not to use X11 headers when use_x11==0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'generated_src_dir': 'src/chromium_gensrc', 7 'generated_src_dir': 'src/chromium_gensrc',
8 }, 8 },
9 'conditions': [ 9 'conditions': [
10 ['use_system_mesa==0', { 10 ['use_system_mesa==0', {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 ], 96 ],
97 'xcode_settings': { 97 'xcode_settings': {
98 'WARNING_CFLAGS': [ 98 'WARNING_CFLAGS': [
99 '-Wno-unknown-pragmas', 99 '-Wno-unknown-pragmas',
100 ], 100 ],
101 }, 101 },
102 'cflags': [ 102 'cflags': [
103 '-Wno-unknown-pragmas', 103 '-Wno-unknown-pragmas',
104 ], 104 ],
105 }, 105 },
106 'conditions': [
107 ['use_x11==0', {
108 'direct_dependent_settings': {
109 'defines': [
110 'MESA_EGL_NO_X11_HEADERS',
111 ],
112 },
113 }],
114 ],
106 }, 115 },
107 { 116 {
108 'target_name': 'mesa_libglslcommon', 117 'target_name': 'mesa_libglslcommon',
109 'type': 'static_library', 118 'type': 'static_library',
110 'include_dirs': [ 119 'include_dirs': [
111 'src/src/gallium/auxiliary', 120 'src/src/gallium/auxiliary',
112 'src/src/gallium/include', 121 'src/src/gallium/include',
113 'src/src/glsl', 122 'src/src/glsl',
114 'src/src/glsl/glcpp', 123 'src/src/glsl/glcpp',
115 'src/src/mapi', 124 'src/src/mapi',
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 'type': 'none', 848 'type': 'none',
840 }, 849 },
841 { 850 {
842 'target_name': 'osmesa', 851 'target_name': 'osmesa',
843 'type': 'none', 852 'type': 'none',
844 }, 853 },
845 ], 854 ],
846 }], 855 }],
847 ], 856 ],
848 } 857 }
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