diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 00:09:08 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 00:09:08 +0000 |
| commit | 6e044a804324619cef3fe90a0f67125841025c0a (patch) | |
| tree | d5e472b904e60514c8270fb481d25e159389c893 /views | |
| parent | acb2b08b0f9f0bb927750469f8d4ccc5157aef61 (diff) | |
| download | chromium_src-6e044a804324619cef3fe90a0f67125841025c0a.zip chromium_src-6e044a804324619cef3fe90a0f67125841025c0a.tar.gz chromium_src-6e044a804324619cef3fe90a0f67125841025c0a.tar.bz2 | |
getting example_views to compile is too much work for now. I'm disabling it
for windows.
Please don't commit code that does not compile.
Review URL: http://codereview.chromium.org/244019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/views.gyp | 76 |
1 files changed, 40 insertions, 36 deletions
diff --git a/views/views.gyp b/views/views.gyp index 81a47f2..fb387e8 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -338,45 +338,49 @@ }], ], }, - { - 'target_name': 'view_examples', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - '../skia/skia.gyp:skia', - 'views', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - 'examples/button_example.h', - 'examples/combobox_example.h', - 'examples/example_base.cc', - 'examples/example_base.h', - 'examples/examples_main_base.cc', - 'examples/examples_main_base.h', - 'examples/examples_main_gtk.cc', - 'examples/message_box_example.h', - 'examples/radio_button_example.h', - 'examples/tabbed_pane_example.h', - ], - 'conditions': [ - ['OS=="linux"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }, - ], - ['OS=="linux" and toolkit_views==1', { + ], + 'conditions': [ + # TODO(oshima): support win + ['OS!="win"', { + 'targets': [ + { + 'target_name': 'view_examples', + 'type': 'executable', 'dependencies': [ + '../base/base.gyp:base', + '../skia/skia.gyp:skia', 'views', ], - }], - ['OS=="win"', { - # TODO(oshima): support win - }], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'examples/button_example.h', + 'examples/combobox_example.h', + 'examples/example_base.cc', + 'examples/example_base.h', + 'examples/examples_main_base.cc', + 'examples/examples_main_base.h', + 'examples/examples_main_gtk.cc', + 'examples/message_box_example.h', + 'examples/radio_button_example.h', + 'examples/tabbed_pane_example.h', + ], + 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }, + ], + ['OS=="linux" and toolkit_views==1', { + 'dependencies': [ + 'views', + ], + }], + ], + }, ], - }, + }], ], } |