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

Unified Diff: webkit/default_plugin/default_plugin.gyp

Issue 39319: Snapshotting progress.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/zlib/zlib.gyp ('k') | webkit/tools/test_shell/test_shell.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/default_plugin/default_plugin.gyp
===================================================================
--- webkit/default_plugin/default_plugin.gyp (revision 11284)
+++ webkit/default_plugin/default_plugin.gyp (working copy)
@@ -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',
+ ],
+ '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'],
+ },
+ },
],
- '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'],
- },
- },
+ },],
],
}
« no previous file with comments | « third_party/zlib/zlib.gyp ('k') | webkit/tools/test_shell/test_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698