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

Side by Side Diff: build/common.gypi

Issue 208037: Added command buffer unit tests to gyp.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | command_buffer/client/cross/cmd_buffer_helper_test.cc » ('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 (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'antlrdir': 'third_party/antlr3', 7 'antlrdir': 'third_party/antlr3',
8 'breakpaddir': 'breakpad/src', 8 'breakpaddir': 'breakpad/src',
9 'cb_service%': 'none',
9 'fcolladadir': 'third_party/fcollada/files', 10 'fcolladadir': 'third_party/fcollada/files',
10 'glewdir': 'third_party/glew/files', 11 'glewdir': 'third_party/glew/files',
11 'gtestdir': 'testing/gtest/include', 12 'gtestdir': 'testing/gtest/include',
12 'jpegdir': 'third_party/libjpeg', 13 'jpegdir': 'third_party/libjpeg',
13 'nacldir': 'third_party/native_client/googleclient', 14 'nacldir': 'third_party/native_client/googleclient',
14 'nixysadir': 'third_party/nixysa', 15 'nixysadir': 'third_party/nixysa',
15 'npapidir': 'third_party/npapi', 16 'npapidir': 'third_party/npapi',
16 'pdiffdir': 'third_party/pdiff/files', 17 'pdiffdir': 'third_party/pdiff/files',
17 'pngdir': 'third_party/libpng', 18 'pngdir': 'third_party/libpng',
18 'screenshotsdir': 'o3d_assets/tests/screenshots', 19 'screenshotsdir': 'o3d_assets/tests/screenshots',
(...skipping 15 matching lines...) Expand all
34 'xcode_settings': { 35 'xcode_settings': {
35 'MACOSX_DEPLOYMENT_TARGET': '10.4', 36 'MACOSX_DEPLOYMENT_TARGET': '10.4',
36 }, 37 },
37 }], 38 }],
38 ], 39 ],
39 }, 40 },
40 'conditions' : [ 41 'conditions' : [
41 ['OS == "win"', 42 ['OS == "win"',
42 { 43 {
43 'variables': { 44 'variables': {
44 'renderer': 'd3d9', 45 'renderer%': 'd3d9',
45 'cgdir': 'third_party/cg/files/win', 46 'cgdir': 'third_party/cg/files/win',
46 'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files', 47 'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files',
47 'LIBRARY_SUFFIX': '.lib', 48 'LIBRARY_SUFFIX': '.lib',
48 }, 49 },
49 'target_defaults': { 50 'target_defaults': {
50 'defines': [ 51 'defines': [
51 '_CRT_SECURE_NO_WARNINGS', 52 '_CRT_SECURE_NO_WARNINGS',
52 'RENDERER_D3D9',
53 'OS_WIN', 53 'OS_WIN',
54 'UNICODE', 54 'UNICODE',
55 'NACL_WINDOWS', 55 'NACL_WINDOWS',
56 ], 56 ],
57 # Disable warning: "'this' : used in base member initialization list." 57 # Disable warning: "'this' : used in base member initialization list."
58 'msvs_disabled_warnings': [4355], 58 'msvs_disabled_warnings': [4355],
59 }, 59 },
60 }, 60 },
61 ], 61 ],
62 ['OS == "mac"', 62 ['OS == "mac"',
63 { 63 {
64 'variables': { 64 'variables': {
65 'renderer': 'gl', 65 'renderer%': 'gl',
66 'cgdir': 'third_party/cg/files/mac', 66 'cgdir': 'third_party/cg/files/mac',
67 'LIBRARY_SUFFIX': '.a', 67 'LIBRARY_SUFFIX': '.a',
68 }, 68 },
69 'target_defaults': { 69 'target_defaults': {
70 'defines': [ 70 'defines': [
71 'RENDERER_GL',
72 'OS_MACOSX', 71 'OS_MACOSX',
73 'UNICODE', 72 'UNICODE',
74 'GTEST_NOT_MAC_FRAMEWORK_MODE', 73 'GTEST_NOT_MAC_FRAMEWORK_MODE',
75 'NACL_OSX=1', 74 'NACL_OSX=1',
76 'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4', 75 'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4',
77 'SK_BUILD_FOR_MAC', 76 'SK_BUILD_FOR_MAC',
78 ], 77 ],
79 'configurations': { 78 'configurations': {
80 'Debug': { 79 'Debug': {
81 'xcode_settings': { 80 'xcode_settings': {
(...skipping 10 matching lines...) Expand all
92 'WARNING_CFLAGS': ['-Wno-deprecated-declarations'], 91 'WARNING_CFLAGS': ['-Wno-deprecated-declarations'],
93 'WARNING_CXXFLAGS': ['-Wstrict-aliasing', 92 'WARNING_CXXFLAGS': ['-Wstrict-aliasing',
94 '-Wno-deprecated',], 93 '-Wno-deprecated',],
95 }, 94 },
96 }, 95 },
97 }, 96 },
98 ], 97 ],
99 ['OS == "linux"', 98 ['OS == "linux"',
100 { 99 {
101 'variables': { 100 'variables': {
102 'renderer': 'gl', 101 'renderer%': 'gl',
103 'cgdir': 'third_party/cg/files/linux', 102 'cgdir': 'third_party/cg/files/linux',
104 'LIBRARY_SUFFIX': '.a', 103 'LIBRARY_SUFFIX': '.a',
105 }, 104 },
106 'target_defaults': { 105 'target_defaults': {
107 'defines': [ 106 'defines': [
108 'LINUX', 107 'LINUX',
109 'MOZ_X11', 108 'MOZ_X11',
110 'NACL_LINUX=1', 109 'NACL_LINUX=1',
111 'OS_LINUX', 110 'OS_LINUX',
112 'RENDERER_GL',
113 'SK_BUILD_FOR_UNIX', 111 'SK_BUILD_FOR_UNIX',
114 'UNICODE', 112 'UNICODE',
115 'XP_UNIX', 113 'XP_UNIX',
116 ], 114 ],
117 'cflags': [ 115 'cflags': [
118 '-fvisibility=hidden', 116 '-fvisibility=hidden',
119 '-Wstrict-aliasing', 117 '-Wstrict-aliasing',
120 ], 118 ],
121 }, 119 },
122 }, 120 },
123 ], 121 ],
122 ['renderer == "d3d9"',
123 {
124 'target_defaults': {
125 'defines': [
126 'RENDERER_D3D9',
127 ],
128 },
129 },
130 ],
131 ['renderer == "gl"',
132 {
133 'target_defaults': {
134 'defines': [
135 'RENDERER_GL',
136 ],
137 },
138 },
139 ],
140 ['renderer == "cb"',
141 {
142 'target_defaults': {
143 'defines': [
144 'RENDERER_CB',
145 ],
146 },
147 },
148 ],
149 ['cb_service == "d3d9"',
150 {
151 'target_defaults': {
152 'defines': [
153 'CB_SERVICE_D3D9',
154 ],
155 },
156 },
157 ],
158 ['cb_service == "gl"',
159 {
160 'target_defaults': {
161 'defines': [
162 'CB_SERVICE_GL',
163 ],
164 },
165 },
166 ],
124 ], 167 ],
125 } 168 }
OLDNEW
« no previous file with comments | « DEPS ('k') | command_buffer/client/cross/cmd_buffer_helper_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698