From c1a2b233574df6256681b1ed1f7a18a10d942d10 Mon Sep 17 00:00:00 2001 From: "scottmg@chromium.org" Date: Wed, 11 Dec 2013 22:08:48 +0000 Subject: Move cloud_print manifestdependency to external .manifest file I plan (https://codereview.chromium.org/111373002/) to make manifest handling simpler in gyp. In particular, doing the manifest embedding in one pass to avoid the need to invoke the linker twice. In order to do this /manifestdependency on the linker command line needs to be removed as it creates dependencies that are only made clear by having the linker generate a manifest. In this case it's simple enough to simply use a .manifest file with the same dependency information that can be merged beforehand. So, move from .gyp linker flags to a file in AdditionalManifestFiles. R=vitalybuka@chromium.org BUG=324863 Review URL: https://codereview.chromium.org/108813005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240189 0039d316-1c4b-4281-b951-d872f2087c98 --- cloud_print/service/common-controls.manifest | 8 ++++++++ cloud_print/service/service.gyp | 12 +++++------- 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 cloud_print/service/common-controls.manifest (limited to 'cloud_print') 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 @@ + + + + + + + + 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='*'\"", - ], }, }, }, -- cgit v1.1