summaryrefslogtreecommitdiffstats
path: root/cloud_print
diff options
context:
space:
mode:
Diffstat (limited to 'cloud_print')
-rw-r--r--cloud_print/service/common-controls.manifest8
-rw-r--r--cloud_print/service/service.gyp12
2 files changed, 13 insertions, 7 deletions
diff --git a/cloud_print/service/common-controls.manifest b/cloud_print/service/common-controls.manifest
new file mode 100644
index 0000000..1710196
--- /dev/null
+++ b/cloud_print/service/common-controls.manifest
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*' />
+ </dependentAssembly>
+ </dependency>
+</assembly>
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 2e07037..f4bc65b 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -137,19 +137,17 @@
'cloud_print_service_lib',
],
'msvs_settings': {
+ 'VCManifestTool': {
+ 'AdditionalManifestFiles': [
+ 'common-controls.manifest',
+ ],
+ },
'VCLinkerTool': {
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
'UACExecutionLevel': '2', # /level='requireAdministrator'
'AdditionalDependencies': [
'secur32.lib',
],
- 'AdditionalOptions': [ # Enable Vista+ look.
- "\"/manifestdependency:type='win32' "
- "name='Microsoft.Windows.Common-Controls' "
- "version='6.0.0.0' "
- "processorArchitecture='*' "
- "publicKeyToken='6595b64144ccf1df' language='*'\"",
- ],
},
},
},