diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 19:07:44 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 19:07:44 +0000 |
| commit | 4447016b31992cea934c3f83fb5d0ddd4147f56e (patch) | |
| tree | dd986da8e5ac0fae1fd34f9a0227d126c160fb30 /remoting/remoting.gyp | |
| parent | 98b5eef7d47215a318634daa9cbc411dae2ecf71 (diff) | |
| download | chromium_src-4447016b31992cea934c3f83fb5d0ddd4147f56e.zip chromium_src-4447016b31992cea934c3f83fb5d0ddd4147f56e.tar.gz chromium_src-4447016b31992cea934c3f83fb5d0ddd4147f56e.tar.bz2 | |
Introducing RdpConsole class that uses the MS RDP ActiveX control to create a Windows session.
BUG=137696,177832
TEST=remoting_unittests.RdpConsoleTest
Review URL: https://chromiumcodereview.appspot.com/12320045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 0dc2921..cdb3ca9 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -432,6 +432,10 @@ 'host/win/launch_process_with_token.h', 'host/win/omaha.cc', 'host/win/omaha.h', + 'host/win/rdp_client.cc', + 'host/win/rdp_client.h', + 'host/win/rdp_client_window.cc', + 'host/win/rdp_client_window.h', 'host/win/security_descriptor.cc', 'host/win/security_descriptor.h', 'host/win/session_desktop_environment.cc', @@ -487,11 +491,19 @@ }], ['OS=="win"', { 'defines': [ + '_ATL_NO_EXCEPTIONS', 'ISOLATION_AWARE_ENABLED=1', ], 'dependencies': [ '../sandbox/sandbox.gyp:sandbox', ], + 'msvs_settings': { + 'VCCLCompilerTool': { + # /MP conflicts with #import directive so we limit the number + # of processes to spawn to 1. + 'AdditionalOptions': ['/MP1'], + }, + }, }], ], }, # end of target 'remoting_host' @@ -1156,6 +1168,9 @@ { 'target_name': 'remoting_configurer', 'type': 'executable', + 'defines': [ + '_ATL_NO_EXCEPTIONS', + ], 'dependencies': [ '../base/base.gyp:base', '../crypto/crypto.gyp:crypto', @@ -1252,6 +1267,7 @@ '_ATL_APARTMENT_THREADED', '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS', '_ATL_NO_AUTOMATIC_NAMESPACE', + '_ATL_NO_EXCEPTIONS', 'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"', 'HOST_IMPLEMENTATION', 'ISOLATION_AWARE_ENABLED=1', @@ -2441,6 +2457,7 @@ 'host/setup/pin_validator_unittest.cc', 'host/test_key_pair.h', 'host/video_scheduler_unittest.cc', + 'host/win/rdp_client_unittest.cc', 'host/win/worker_process_launcher.cc', 'host/win/worker_process_launcher.h', 'host/win/worker_process_launcher_unittest.cc', @@ -2480,6 +2497,9 @@ ], 'conditions': [ [ 'OS=="win"', { + 'defines': [ + '_ATL_NO_EXCEPTIONS', + ], 'include_dirs': [ '../breakpad/src', ], |