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

Side by Side Diff: gpu/demos/demos.gyp

Issue 3531008: Integrated Pepper3D v2 with the accelerated compositor.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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 | Annotate | Revision Log
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 'chromium_code': 1, 7 'chromium_code': 1,
8 'conditions': [ 8 'conditions': [
9 # Pepper demos that are compiled as shared libraries need to be compiled 9 # Pepper demos that are compiled as shared libraries need to be compiled
10 # with -fPIC flag. All static libraries that these demos depend on must 10 # with -fPIC flag. All static libraries that these demos depend on must
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 '../../third_party', 149 '../../third_party',
150 '../../third_party/gles2_book/Common/Include', 150 '../../third_party/gles2_book/Common/Include',
151 '../../ppapi', 151 '../../ppapi',
152 '../..' 152 '../..'
153 ], 153 ],
154 'run_as': { 154 'run_as': {
155 'conditions': [ 155 'conditions': [
156 ['OS=="mac"', { 156 ['OS=="mac"', {
157 'action': [ 157 'action': [
158 '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium', 158 '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium',
159 '--enable-gpu-plugin',
160 '--register-pepper-plugins=' 159 '--register-pepper-plugins='
161 '<(PRODUCT_DIR)/$(PRODUCT_NAME).plugin;' 160 '<(PRODUCT_DIR)/$(PRODUCT_NAME).plugin;'
162 'pepper-application/x-gpu-demo', 161 'pepper-application/x-gpu-demo',
163 'file://$(SOURCE_ROOT)/pepper_gpu_demo.html', 162 'file://$(SOURCE_ROOT)/pepper_gpu_demo.html',
164 ], 163 ],
165 }, { # OS != "mac" 164 }, { # OS != "mac"
166 'action': [ 165 'action': [
167 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)', 166 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
168 '--enable-gpu-plugin',
169 '--register-pepper-plugins=$(TargetPath);' 167 '--register-pepper-plugins=$(TargetPath);'
170 'pepper-application/x-gpu-demo', 168 'pepper-application/x-gpu-demo',
171 'file://$(ProjectDir)pepper_gpu_demo.html', 169 'file://$(ProjectDir)pepper_gpu_demo.html',
172 ], 170 ],
173 }], 171 }],
174 ], 172 ],
175 }, 173 },
176 'conditions': [ 174 'conditions': [
177 ['OS=="linux"', { 175 ['OS=="linux"', {
178 # -gstabs, used in the official builds, causes an ICE. Remove it. 176 # -gstabs, used in the official builds, causes an ICE. Remove it.
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 ], 442 ],
445 }], 443 }],
446 ], 444 ],
447 } 445 }
448 446
449 # Local Variables: 447 # Local Variables:
450 # tab-width:2 448 # tab-width:2
451 # indent-tabs-mode:nil 449 # indent-tabs-mode:nil
452 # End: 450 # End:
453 # vim: set expandtab tabstop=2 shiftwidth=2: 451 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698