diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 23:46:51 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 23:46:51 +0000 |
| commit | 1e8acf55bca9ea13ed940b3c197a89d2585b00d6 (patch) | |
| tree | f6fbdc16bb4343d84ac6f5d15e47b19dbf04d044 /o3d/build | |
| parent | 2fb46f5562289e88312ff4b0c1419648510e3940 (diff) | |
| download | chromium_src-1e8acf55bca9ea13ed940b3c197a89d2585b00d6.zip chromium_src-1e8acf55bca9ea13ed940b3c197a89d2585b00d6.tar.gz chromium_src-1e8acf55bca9ea13ed940b3c197a89d2585b00d6.tar.bz2 | |
This fixes the renderer variable setting to fix the build.
TBR=apatrick
Review URL: http://codereview.chromium.org/249009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/common.gypi | 81 |
1 files changed, 54 insertions, 27 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index e847b54..b123880 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -56,6 +56,29 @@ ], # Disable warning: "'this' : used in base member initialization list." 'msvs_disabled_warnings': [4355], + 'conditions': [ + ['renderer == "d3d9"', + { + 'defines': [ + 'RENDERER_D3D9', + ], + }, + ], + ['renderer == "gl"', + { + 'defines': [ + 'RENDERER_GL', + ], + }, + ], + ['renderer == "cb"', + { + 'defines': [ + 'RENDERER_CB', + ], + }, + ], + ], }, }, ], @@ -78,7 +101,6 @@ 'configurations': { 'Debug': { 'xcode_settings': { -# 'OTHER_CFLAGS': ['-ggdb', '-g',], 'GCC_DEBUGGING_SYMBOLS': 'full', 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', }, @@ -92,6 +114,22 @@ 'WARNING_CXXFLAGS': ['-Wstrict-aliasing', '-Wno-deprecated',], }, + 'conditions': [ + ['renderer == "gl"', + { + 'defines': [ + 'RENDERER_GL', + ], + }, + ], + ['renderer == "cb"', + { + 'defines': [ + 'RENDERER_CB', + ], + }, + ], + ], }, }, ], @@ -116,32 +154,21 @@ '-fvisibility=hidden', '-Wstrict-aliasing', ], - }, - }, - ], - ['renderer == "d3d9"', - { - 'target_defaults': { - 'defines': [ - 'RENDERER_D3D9', - ], - }, - }, - ], - ['renderer == "gl"', - { - 'target_defaults': { - 'defines': [ - 'RENDERER_GL', - ], - }, - }, - ], - ['renderer == "cb"', - { - 'target_defaults': { - 'defines': [ - 'RENDERER_CB', + 'conditions': [ + ['renderer == "gl"', + { + 'defines': [ + 'RENDERER_GL', + ], + }, + ], + ['renderer == "cb"', + { + 'defines': [ + 'RENDERER_CB', + ], + }, + ], ], }, }, |