diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-05 23:30:53 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-05 23:30:53 +0000 |
| commit | bd273abc175e9c8981a03b1f388f044fdba7cfba (patch) | |
| tree | 982c10a8c099032a0bf7a4898ca1e42007846653 /webkit | |
| parent | 38c1b19ed2f77a642f7ae0b1921b31240f1346c9 (diff) | |
| download | chromium_src-bd273abc175e9c8981a03b1f388f044fdba7cfba.zip chromium_src-bd273abc175e9c8981a03b1f388f044fdba7cfba.tar.gz chromium_src-bd273abc175e9c8981a03b1f388f044fdba7cfba.tar.bz2 | |
Begin Linux port of webkit/default_plugin.
This just isolates the Windows build before porting sources.
Review URL: http://codereview.chromium.org/475
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/SConscript | 2 | ||||
| -rw-r--r-- | webkit/default_plugin/SConscript | 44 |
2 files changed, 28 insertions, 18 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index bc3d70f..8abf61c 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -151,6 +151,7 @@ sconscript_dirs = [ 'build/JavaScriptCore/SConscript', 'build/port/SConscript', 'build/V8Bindings/SConscript', + 'default_plugin/SConscript', ] if env['PLATFORM'] == 'win32': # These extra dirs aren't win32-specific, they're just the dirs that @@ -162,7 +163,6 @@ if env['PLATFORM'] == 'win32': 'build/WebCore/SConscript', # This almost works on linux. It requires # some changes to WebKit that we'll get # in the merge. - 'default_plugin/SConscript', 'glue/SConscript', 'glue/plugins/test/SConscript', 'tools/npapi_layout_test_plugin/SConscript', diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript index 8a0357c..571e64d 100644 --- a/webkit/default_plugin/SConscript +++ b/webkit/default_plugin/SConscript @@ -18,27 +18,37 @@ env.Prepend( ) env.Append( - CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', - 'LIBXML_STATIC', - ], - CCFLAGS = [ - '/TP', - - '/WX', - '/Wp64', - ], + CPPDEFINES = [ + 'U_STATIC_IMPLEMENTATION', + 'LIBXML_STATIC', + ], ) +if env['PLATFORM'] == 'win32': + env.Append( + CCFLAGS = [ + '/TP', + + '/WX', + '/Wp64', + ], + ) + +# Platform-independent files. input_files = [ - 'activex_installer.cc', - 'default_plugin.cc', - 'plugin_main.cc', - 'plugin_impl.cc', - 'plugin_database_handler.cc', - 'plugin_install_job_monitor.cc', - 'install_dialog.cc', ] +# TODO: Quarantine files -- need porting to platform-specific blocks above. +if env['PLATFORM'] == 'win32': + input_files.extend([ + 'activex_installer.cc', + 'default_plugin.cc', + 'plugin_main.cc', + 'plugin_impl.cc', + 'plugin_database_handler.cc', + 'plugin_install_job_monitor.cc', + 'install_dialog.cc', + ]) + env.ChromeStaticLibrary('default_plugin', input_files) |