diff options
author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 22:56:42 +0000 |
---|---|---|
committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 22:56:42 +0000 |
commit | 19acec58876633bff72e7ffd657b36a768f3bba5 (patch) | |
tree | 05f3c851e219ab8b67d03a7545cee0e260bf9313 /webkit/default_plugin/default_plugin.gyp | |
parent | 3daae9f20e7f07a903ab420415cdae9599f2b544 (diff) | |
download | chromium_src-19acec58876633bff72e7ffd657b36a768f3bba5.zip chromium_src-19acec58876633bff72e7ffd657b36a768f3bba5.tar.gz chromium_src-19acec58876633bff72e7ffd657b36a768f3bba5.tar.bz2 |
Snapshotting progress.
Got app and unit_tests linking with gyp under windows.
Still missing pieces (things don't run).
Review URL: http://codereview.chromium.org/39319
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/default_plugin/default_plugin.gyp')
-rw-r--r-- | webkit/default_plugin/default_plugin.gyp | 77 |
1 files changed, 42 insertions, 35 deletions
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp index a3a9a7c..ba37b61 100644 --- a/webkit/default_plugin/default_plugin.gyp +++ b/webkit/default_plugin/default_plugin.gyp @@ -7,41 +7,48 @@ '../../build/common.gypi', ], 'targets': [ - { - 'target_name': 'default_plugin', - 'type': 'static_library', - 'dependencies': [ - '../../third_party/libxml/libxml.gyp:libxml', - '../../third_party/icu38/icu38.gyp:icui18n', - '../../third_party/icu38/icu38.gyp:icuuc', - '../../third_party/npapi/npapi.gyp:npapi', - '../../net/net.gyp:net_resources', - ], - 'include_dirs': [ - '../..', - # TODO(bradnelson): this should fall out of the dependencies. - '<(SHARED_INTERMEDIATE_DIR)/webkit', - ], - 'sources': [ - 'activex_installer.cc', - 'activex_installer.h', - 'default_plugin.cc', - 'default_plugin_resources.h', - 'default_plugin_shared.h', - 'install_dialog.cc', - 'install_dialog.h', - 'plugin_database_handler.cc', - 'plugin_database_handler.h', - 'plugin_impl_win.cc', - 'plugin_impl_win.h', - 'plugin_install_job_monitor.cc', - 'plugin_install_job_monitor.h', - 'plugin_main.cc', - 'plugin_main.h', + ], + 'conditions': [ + ['OS=="win"', { + 'targets': [ + { + 'target_name': 'default_plugin', + 'type': 'static_library', + 'dependencies': [ + '../../third_party/libxml/libxml.gyp:libxml', + '../../third_party/icu38/icu38.gyp:icui18n', + '../../third_party/icu38/icu38.gyp:icuuc', + '../../third_party/npapi/npapi.gyp:npapi', + '../webkit.gyp:webkit_resources', + '../../net/net.gyp:net_resources', + ], + 'include_dirs': [ + '../..', + # TODO(bradnelson): this should fall out of the dependencies. + '<(SHARED_INTERMEDIATE_DIR)/webkit', + ], + 'sources': [ + 'activex_installer.cc', + 'activex_installer.h', + 'default_plugin.cc', + 'default_plugin_resources.h', + 'default_plugin_shared.h', + 'install_dialog.cc', + 'install_dialog.h', + 'plugin_database_handler.cc', + 'plugin_database_handler.h', + 'plugin_impl_win.cc', + 'plugin_impl_win.h', + 'plugin_install_job_monitor.cc', + 'plugin_install_job_monitor.h', + 'plugin_main.cc', + 'plugin_main.h', + ], + 'link_settings': { + 'libraries': ['-lUrlmon.lib'], + }, + }, ], - 'link_settings': { - 'libraries': ['-lUrlmon.lib'], - }, - }, + },], ], } |