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

Side by Side Diff: build/common.gypi

Issue 7067029: Prototype compositor to render views to a texture using d3d 10. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix gyp Created 9 years, 7 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 | « no previous file | ui/gfx/compositor/compositor.gyp » ('j') | ui/gfx/resources/compositor.fx » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
11 'variables': { 11 'variables': {
12 # Putting a variables dict inside another variables dict looks kind of 12 # Putting a variables dict inside another variables dict looks kind of
13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as 13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as
14 # variables within the outer variables dict here. This is necessary 14 # variables within the outer variables dict here. This is necessary
15 # to get these variables defined for the conditions within this variables 15 # to get these variables defined for the conditions within this variables
16 # dict that operate on these variables (e.g., for setting 'toolkit_views', 16 # dict that operate on these variables (e.g., for setting 'toolkit_views',
17 # we need to have 'chromeos' already set). 17 # we need to have 'chromeos' already set).
18 'variables': { 18 'variables': {
19 'variables': { 19 'variables': {
20 'variables': { 20 'variables': {
21 # Whether we're building a ChromeOS build. 21 # Whether we're building a ChromeOS build.
22 'chromeos%': 0, 22 'chromeos%': 0,
23 23
24 # Disable touch support by default. 24 # Disable touch support by default.
25 'touchui%': 0, 25 'touchui%': 0,
26
27 # Whether the compositor is enabled on views.
28 'views_compositor%': 0,
26 }, 29 },
27 # Copy conditionally-set variables out one scope. 30 # Copy conditionally-set variables out one scope.
28 'chromeos%': '<(chromeos)', 31 'chromeos%': '<(chromeos)',
29 'touchui%': '<(touchui)', 32 'touchui%': '<(touchui)',
33 'views_compositor%': '<(views_compositor)',
30 34
31 # Compute the architecture that we're building on. 35 # Compute the architecture that we're building on.
32 'conditions': [ 36 'conditions': [
33 [ 'OS=="win" or OS=="mac"', { 37 [ 'OS=="win" or OS=="mac"', {
34 'host_arch%': 'ia32', 38 'host_arch%': 'ia32',
35 }, { 39 }, {
36 # This handles the Unix platforms for which there is some support. 40 # This handles the Unix platforms for which there is some support.
37 # Anything else gets passed through, which probably won't work very 41 # Anything else gets passed through, which probably won't work very
38 # well; such hosts should pass an explicit target_arch to gyp. 42 # well; such hosts should pass an explicit target_arch to gyp.
39 'host_arch%': 43 'host_arch%':
40 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 44 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
41 }], 45 }],
42 46
43 # Set default value of toolkit_views on for Windows, Chrome OS 47 # Set default value of toolkit_views on for Windows, Chrome OS
44 # and the touch UI. 48 # and the touch UI.
45 ['OS=="win" or chromeos==1 or touchui==1', { 49 ['OS=="win" or chromeos==1 or touchui==1', {
46 'toolkit_views%': 1, 50 'toolkit_views%': 1,
47 }, { 51 }, {
48 'toolkit_views%': 0, 52 'toolkit_views%': 0,
49 }], 53 }],
50 ], 54 ],
51 }, 55 },
52 56
53 # Copy conditionally-set variables out one scope. 57 # Copy conditionally-set variables out one scope.
54 'chromeos%': '<(chromeos)', 58 'chromeos%': '<(chromeos)',
55 'touchui%': '<(touchui)', 59 'touchui%': '<(touchui)',
56 'host_arch%': '<(host_arch)', 60 'host_arch%': '<(host_arch)',
57 'toolkit_views%': '<(toolkit_views)', 61 'toolkit_views%': '<(toolkit_views)',
62 'views_compositor%': '<(views_compositor)',
58 63
59 # We used to provide a variable for changing how libraries were built. 64 # We used to provide a variable for changing how libraries were built.
60 # This variable remains until we can clean up all the users. 65 # This variable remains until we can clean up all the users.
61 # This needs to be one nested variables dict in so that dependent 66 # This needs to be one nested variables dict in so that dependent
62 # gyp files can make use of it in their outer variables. (Yikes!) 67 # gyp files can make use of it in their outer variables. (Yikes!)
63 # http://code.google.com/p/chromium/issues/detail?id=83308 68 # http://code.google.com/p/chromium/issues/detail?id=83308
64 'library%': 'static_library', 69 'library%': 'static_library',
65 70
66 # Override branding to select the desired branding flavor. 71 # Override branding to select the desired branding flavor.
67 'branding%': 'Chromium', 72 'branding%': 'Chromium',
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 ], 198 ],
194 }, 199 },
195 200
196 # Copy conditionally-set variables out one scope. 201 # Copy conditionally-set variables out one scope.
197 'branding%': '<(branding)', 202 'branding%': '<(branding)',
198 'buildtype%': '<(buildtype)', 203 'buildtype%': '<(buildtype)',
199 'target_arch%': '<(target_arch)', 204 'target_arch%': '<(target_arch)',
200 'host_arch%': '<(host_arch)', 205 'host_arch%': '<(host_arch)',
201 'library%': 'static_library', 206 'library%': 'static_library',
202 'toolkit_views%': '<(toolkit_views)', 207 'toolkit_views%': '<(toolkit_views)',
208 'views_compositor%': '<(views_compositor)',
203 'os_posix%': '<(os_posix)', 209 'os_posix%': '<(os_posix)',
204 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 210 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
205 'use_x11%': '<(use_x11)', 211 'use_x11%': '<(use_x11)',
206 'use_gnome_keyring%': '<(use_gnome_keyring)', 212 'use_gnome_keyring%': '<(use_gnome_keyring)',
207 'linux_fpic%': '<(linux_fpic)', 213 'linux_fpic%': '<(linux_fpic)',
208 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 214 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
209 'chromeos%': '<(chromeos)', 215 'chromeos%': '<(chromeos)',
210 'touchui%': '<(touchui)', 216 'touchui%': '<(touchui)',
211 'file_manager_extension%': '<(file_manager_extension)', 217 'file_manager_extension%': '<(file_manager_extension)',
212 'inside_chromium_build%': '<(inside_chromium_build)', 218 'inside_chromium_build%': '<(inside_chromium_build)',
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 }, 627 },
622 'conditions': [ 628 'conditions': [
623 ['branding=="Chrome"', { 629 ['branding=="Chrome"', {
624 'defines': ['GOOGLE_CHROME_BUILD'], 630 'defines': ['GOOGLE_CHROME_BUILD'],
625 }, { # else: branding!="Chrome" 631 }, { # else: branding!="Chrome"
626 'defines': ['CHROMIUM_BUILD'], 632 'defines': ['CHROMIUM_BUILD'],
627 }], 633 }],
628 ['toolkit_views==1', { 634 ['toolkit_views==1', {
629 'defines': ['TOOLKIT_VIEWS=1'], 635 'defines': ['TOOLKIT_VIEWS=1'],
630 }], 636 }],
637 ['views_compositor==1', {
638 # TODO(sky): nuke COMPOSITOR_2 when we remove it from views.
639 'defines': ['VIEWS_COMPOSITOR=1', 'COMPOSITOR_2=1'],
640 }],
631 ['chromeos==1', { 641 ['chromeos==1', {
632 'defines': ['OS_CHROMEOS=1'], 642 'defines': ['OS_CHROMEOS=1'],
633 }], 643 }],
634 ['touchui==1', { 644 ['touchui==1', {
635 'defines': ['TOUCH_UI=1'], 645 'defines': ['TOUCH_UI=1'],
636 }], 646 }],
637 ['file_manager_extension==1', { 647 ['file_manager_extension==1', {
638 'defines': ['FILE_MANAGER_EXTENSION=1'], 648 'defines': ['FILE_MANAGER_EXTENSION=1'],
639 }], 649 }],
640 ['profiling==1', { 650 ['profiling==1', {
(...skipping 1079 matching lines...) Expand 10 before | Expand all | Expand 10 after
1720 # and therefore SYMROOT, needs to be set at the project level. 1730 # and therefore SYMROOT, needs to be set at the project level.
1721 'SYMROOT': '<(DEPTH)/xcodebuild', 1731 'SYMROOT': '<(DEPTH)/xcodebuild',
1722 }, 1732 },
1723 } 1733 }
1724 1734
1725 # Local Variables: 1735 # Local Variables:
1726 # tab-width:2 1736 # tab-width:2
1727 # indent-tabs-mode:nil 1737 # indent-tabs-mode:nil
1728 # End: 1738 # End:
1729 # vim: set expandtab tabstop=2 shiftwidth=2: 1739 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/compositor/compositor.gyp » ('j') | ui/gfx/resources/compositor.fx » ('J')

Powered by Google App Engine
This is Rietveld 408576698