diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 17:22:48 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 17:22:48 +0000 |
| commit | e557d64b1d89a5acbe4b185e63c029c428bd217b (patch) | |
| tree | adc254b279329bfae6f1a53cc19a03a3cade7a41 /views/views.gyp | |
| parent | dd92c8dc5191650d37501f74bf017e4ad4f664a4 (diff) | |
| download | chromium_src-e557d64b1d89a5acbe4b185e63c029c428bd217b.zip chromium_src-e557d64b1d89a5acbe4b185e63c029c428bd217b.tar.gz chromium_src-e557d64b1d89a5acbe4b185e63c029c428bd217b.tar.bz2 | |
Porting the view examples to Windows.
Some refactoring done to the tests also.
See original review at:
http://codereview.chromium.org/295013/show
BUG=None
TEST=Make sure the view examples build and run on Windows
and Linux.
Review URL: http://codereview.chromium.org/294026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29525 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 82 |
1 files changed, 43 insertions, 39 deletions
diff --git a/views/views.gyp b/views/views.gyp index 655c57d..7074cf9 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -338,51 +338,55 @@ }], ], }, - ], - 'conditions': [ - # TODO(oshima): support win - ['OS!="win"', { - 'targets': [ - { - 'target_name': 'view_examples', - 'type': 'executable', + { + '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.cc', + 'examples/examples_main.h', + 'examples/message_box_example.h', + 'examples/radio_button_example.h', + 'examples/scroll_view_example.h', + 'examples/tabbed_pane_example.h', + 'examples/textfield_example.h', + ], + 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }, + ], + ['OS=="linux" and toolkit_views==1', { 'dependencies': [ - '../base/base.gyp:base', - '../skia/skia.gyp:skia', 'views', ], + }], + ['OS=="win"', { + 'link_settings': { + 'libraries': [ + '-limm32.lib', + '-loleacc.lib', + ] + }, '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', - 'examples/textfield_example.h', - ], - 'conditions': [ - ['OS=="linux"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', - ], - }, - ], - ['OS=="linux" and toolkit_views==1', { - 'dependencies': [ - 'views', - ], - }], + '../chrome/third_party/wtl/include', ], - }, + }], ], - }], + }, ], } |