diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 18:03:02 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 18:03:02 +0000 |
| commit | 14ab3ef81773a92741c14b3406e3de6aa2e58cd5 (patch) | |
| tree | 4d09bcec9f2e9404e7345f58be6894aee76628dd | |
| parent | 89558472754d01308fd9bb4bd306923fe7d574de (diff) | |
| download | chromium_src-14ab3ef81773a92741c14b3406e3de6aa2e58cd5.zip chromium_src-14ab3ef81773a92741c14b3406e3de6aa2e58cd5.tar.gz chromium_src-14ab3ef81773a92741c14b3406e3de6aa2e58cd5.tar.bz2 | |
Change delayload attribute from string to list in gyp files
Change from string to list so the list can merge correctly.
TBR=scherkus
Review URL: http://codereview.chromium.org/125059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18294 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 7eff803..f7ec8c2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -486,7 +486,11 @@ ], 'AdditionalLibraryDirectories': '<(DEPTH)/third_party/platformsdk_win2008_6_1/files/Lib', - 'DelayLoadDLLs': 'dbghelp.dll,dwmapi.dll,uxtheme.dll', + 'DelayLoadDLLs': [ + 'dbghelp.dll', + 'dwmapi.dll', + 'uxtheme.dll', + ], 'GenerateDebugInformation': 'true', 'MapFileName': '$(OutDir)\\$(TargetName).map', 'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib', diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index ca33041..e031c27 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -88,7 +88,11 @@ }, 'msvs_settings': { 'VCLinkerTool': { - 'DelayLoadDLLs': 'avcodec-52.dll,avformat-52.dll,avutil-50.dll', + 'DelayLoadDLLs': [ + 'avcodec-52.dll', + 'avformat-52.dll', + 'avutil-50.dll', + ], }, }, }, |