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

Unified Diff: remoting/remoting.gyp

Issue 12390060: RdpDesktopSession COM class should only use raw interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 10 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 | « remoting/host/win/rdp_desktop_session.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index daf3619073f00f331cf97be74b8f6edf21f50f08..05c5c9b56a3c8c6b226de12c01f1113f7ad9669c 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1183,6 +1183,24 @@
],
}, # end of target 'remoting_lib_idl'
+ # remoting_lib_ps builds the proxy/stub code generated by MIDL (see
+ # remoting_lib_idl).
+ {
+ 'target_name': 'remoting_lib_ps',
+ 'type': 'static_library',
+ 'defines': [
+ # Prepend 'Ps' to the MIDL-generated routines. This includes
+ # DllGetClassObject, DllCanUnloadNow, DllRegisterServer,
+ # DllUnregisterServer, and DllMain.
+ 'ENTRY_PREFIX=Ps',
+ 'REGISTER_PROXY_DLL',
+ ],
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.dlldata.c',
+ '<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib_p.c',
+ ],
+ }, # end of target 'remoting_lib_ps'
+
# Regenerates 'chromoting_lib.rc' (used to embed 'chromoting_lib.tlb'
# into remoting_core.dll's resources) every time
# 'chromoting_lib_idl.templ' changes. Making remoting_core depend on
@@ -1339,6 +1357,7 @@
'remoting_host_event_logger',
'remoting_host_logging',
'remoting_lib_idl',
+ 'remoting_lib_ps',
'remoting_lib_rc',
'remoting_me2me_host_static',
'remoting_protocol',
@@ -1406,8 +1425,20 @@
'VCLinkerTool': {
'AdditionalDependencies': [
'comctl32.lib',
+ 'rpcns4.lib',
+ 'rpcrt4.lib',
+ 'uuid.lib',
'wtsapi32.lib',
],
+ # Export the proxy/stub entry points. Note that the generated
+ # routines have 'Ps' prefix to avoid conflicts with our own
+ # DllMain().
+ 'AdditionalOptions': [
+ '/EXPORT:DllGetClassObject=PsDllGetClassObject,PRIVATE',
+ '/EXPORT:DllCanUnloadNow=PsDllCanUnloadNow,PRIVATE',
+ '/EXPORT:DllRegisterServer=PsDllRegisterServer,PRIVATE',
+ '/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE',
+ ],
},
},
}, # end of target 'remoting_core'
« no previous file with comments | « remoting/host/win/rdp_desktop_session.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698