summaryrefslogtreecommitdiffstats
path: root/remoting/remoting.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/remoting.gyp')
-rw-r--r--remoting/remoting.gyp31
1 files changed, 10 insertions, 21 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index ae025ae..a93a8d2 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -735,14 +735,8 @@
'msvs_settings': {
'VCManifestTool': {
'EmbedManifest': 'true',
- },
- 'VCLinkerTool': {
- 'AdditionalOptions': [
- "\"/manifestdependency:type='win32' "
- "name='Microsoft.Windows.Common-Controls' "
- "version='6.0.0.0' "
- "processorArchitecture='*' "
- "publicKeyToken='6595b64144ccf1df' language='*'\"",
+ 'AdditionalManifestFiles': [
+ 'host/win/common-controls.manifest',
],
},
},
@@ -1503,14 +1497,12 @@
'host/setup/win/start_host_window.h',
],
'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalOptions': [
- "\"/manifestdependency:type='win32' "
- "name='Microsoft.Windows.Common-Controls' "
- "version='6.0.0.0' "
- "processorArchitecture='*' "
- "publicKeyToken='6595b64144ccf1df' language='*'\"",
+ 'VCManifestTool': {
+ 'AdditionalManifestFiles': [
+ 'host/win/common-controls.manifest',
],
+ },
+ 'VCLinkerTool': {
# 2 == /SUBSYSTEM:WINDOWS
'SubSystem': '2',
},
@@ -1644,6 +1636,9 @@
'msvs_settings': {
'VCManifestTool': {
'EmbedManifest': 'true',
+ 'AdditionalManifestFiles': [
+ 'host/win/common-controls.manifest',
+ ],
},
'VCLinkerTool': {
'AdditionalDependencies': [
@@ -1654,12 +1649,6 @@
'wtsapi32.lib',
],
'AdditionalOptions': [
- "\"/manifestdependency:type='win32' "
- "name='Microsoft.Windows.Common-Controls' "
- "version='6.0.0.0' "
- "processorArchitecture='*' "
- "publicKeyToken='6595b64144ccf1df' language='*'\"",
-
# Export the proxy/stub entry points. Note that the generated
# routines have 'Ps' prefix to avoid conflicts with our own
# DllMain().