diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript | 1 | ||||
| -rw-r--r-- | chrome/chrome.scons | 1 | ||||
| -rw-r--r-- | chrome/plugin/plugin.scons (renamed from chrome/plugin/SConscript) | 37 |
3 files changed, 26 insertions, 13 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 042d25d..dd02a36 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -399,7 +399,6 @@ if env['PLATFORM'] == 'win32': env.SConscript(test_sconscript_files, exports=['env_test']) sconscript_files = [ - 'plugin/SConscript', 'renderer/SConscript', 'test/chrome_plugin/SConscript', 'third_party/hunspell/SConscript', diff --git a/chrome/chrome.scons b/chrome/chrome.scons index 60f6e0c..42f9489 100644 --- a/chrome/chrome.scons +++ b/chrome/chrome.scons @@ -15,6 +15,7 @@ sconscript_files = [ 'test/unit/unit_tests.scons', 'common/common.scons', 'common/ipc_tests.scons', + 'plugin/plugin.scons', ] SConscript(sconscript_files, exports=['env']) diff --git a/chrome/plugin/SConscript b/chrome/plugin/plugin.scons index 937d001..1a54366 100644 --- a/chrome/plugin/SConscript +++ b/chrome/plugin/plugin.scons @@ -6,30 +6,41 @@ Import('env') env = env.Clone() +env.SConscript([ + '$NPAPI_DIR/using_npapi.scons', + '$SKIA_DIR/using_skia.scons', +], {'env':env}) env.Prepend( CPPPATH = [ - '$NPAPI_DIR', - '$CHROME_DIR/tools/build/win', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', '$CHROME_SRC_DIR', ], ) -input_files = [ -] - if env['PLATFORM'] == 'win32': env.Prepend( - CCFLAGS = [ - '/TP', + CPPPATH = [ + '$CHROME_DIR/tools/build/win', ], ) +input_files = [ + 'chrome_plugin_host.cc', + 'npobject_proxy.cc', + 'npobject_stub.cc', + 'npobject_util.cc', + 'plugin_channel.cc', + 'plugin_channel_base.cc', + 'plugin_main.cc', + 'plugin_process.cc', + 'plugin_thread.cc', + 'webplugin_delegate_stub.cc', + 'webplugin_proxy.cc', +] + +if env['PLATFORM'] in ('posix', 'darwin'): # TODO(port) - input_files.extend([ + to_be_ported_files = [ 'chrome_plugin_host.cc', 'npobject_proxy.cc', 'npobject_stub.cc', @@ -41,7 +52,9 @@ if env['PLATFORM'] == 'win32': 'plugin_thread.cc', 'webplugin_delegate_stub.cc', 'webplugin_proxy.cc', - ]) + ] + for remove in to_be_ported_files: + input_files.remove(remove) env.ChromeStaticLibrary('plugin', input_files) |