diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 23:58:56 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 23:58:56 +0000 |
| commit | cfb7e061c279b7adae8ec8f8161d9d56fc4e043f (patch) | |
| tree | 883344531c208d910d8f21b7685e343675cae82e /remoting/remoting.gyp | |
| parent | 657cab96e02528adfe513c90c4f07a036d92bfe6 (diff) | |
| download | chromium_src-cfb7e061c279b7adae8ec8f8161d9d56fc4e043f.zip chromium_src-cfb7e061c279b7adae8ec8f8161d9d56fc4e043f.tar.gz chromium_src-cfb7e061c279b7adae8ec8f8161d9d56fc4e043f.tar.bz2 | |
Chromoting: The me2me host is now configurable from the web UI on Windows.
Review URL: https://chromiumcodereview.appspot.com/9953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 77ce3fe..379a4ab 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -238,9 +238,12 @@ '<(INTERMEDIATE_DIR)', ], 'dependencies': [ + '../base/base.gyp:base', 'remoting_version_resources', ], 'sources': [ + 'host/branding.cc', + 'host/branding.h', 'host/elevated_controller.idl', 'host/elevated_controller.rc', 'host/elevated_controller_module_win.cc', @@ -515,6 +518,8 @@ '../third_party/npapi/npapi.gyp:npapi', ], 'sources': [ + 'host/branding.cc', + 'host/branding.h', 'host/it2me_host_user_interface.cc', 'host/it2me_host_user_interface.h', 'host/plugin/daemon_controller.h', @@ -569,7 +574,11 @@ '../ipc/ipc.gyp:ipc', 'remoting_version_resources', ], + 'include_dirs': [ + '<(INTERMEDIATE_DIR)', + ], 'sources': [ + 'host/elevated_controller.idl', 'host/plugin/host_plugin.def', 'host/plugin/host_plugin.rc', '<(SHARED_INTERMEDIATE_DIR)/remoting_version/host_plugin_version.rc' |