diff options
author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-23 01:28:39 +0000 |
---|---|---|
committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-23 01:28:39 +0000 |
commit | f5c07cfb7e518298f0b9956cd636fd36bca943da (patch) | |
tree | 293f7d000591f6fdee30f652416dac99b61f5e70 /third_party | |
parent | 936f535cfbf9d82559cd54e1011f54480839b790 (diff) | |
download | chromium_src-f5c07cfb7e518298f0b9956cd636fd36bca943da.zip chromium_src-f5c07cfb7e518298f0b9956cd636fd36bca943da.tar.gz chromium_src-f5c07cfb7e518298f0b9956cd636fd36bca943da.tar.bz2 |
Adding ffmpeg_binaries target which copies FFmpeg binaries alongside chrome.dll if present.
Review URL: http://codereview.chromium.org/114048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/ffmpeg/copy_binaries.sh | 13 | ||||
-rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 35 |
2 files changed, 47 insertions, 1 deletions
diff --git a/third_party/ffmpeg/copy_binaries.sh b/third_party/ffmpeg/copy_binaries.sh new file mode 100644 index 0000000..fb59e15 --- /dev/null +++ b/third_party/ffmpeg/copy_binaries.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# +# Copies FFmpeg binaries due to gyp limitations on how much you can cram +# into a rules action. + +SOURCE=$1 +DESTINATION=$2 + +# Our cygwin environment is very limited: "if" isn't available. +test -f $SOURCE && cp -v -f $SOURCE $DESTINATION + +# Make sure we always succeed. +exit 0 diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 30d03b7..13edb9a 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -68,7 +68,10 @@ ], }, }, - 'dependencies': ['../../build/win/system.gyp:cygwin'], + 'dependencies': [ + 'ffmpeg_binaries', + '../../build/win/system.gyp:cygwin', + ], 'rules': [ { 'rule_name': 'generate_libs', @@ -93,5 +96,35 @@ }], ], }, + { + 'target_name': 'ffmpeg_binaries', + 'type': 'none', + 'msvs_guid': '4E4070E1-EFD9-4ef1-8634-3960956F6F10', + 'conditions': [ + ['OS=="win"', { + 'sources': [ + 'binaries/avcodec-52.dll', + 'binaries/avformat-52.dll', + 'binaries/avutil-50.dll', + 'binaries/pthreadGC2.dll', + ], + 'dependencies': ['../../build/win/system.gyp:cygwin'], + 'rules': [ + { + 'rule_name': 'copy_binaries', + 'extension': 'dll', + 'inputs': [ + 'copy_binaries.sh', + ], + 'outputs': [ + '<(PRODUCT_DIR)/<(RULE_INPUT_NAME)', + ], + 'action': ['./copy_binaries.sh', '"<@(RULE_INPUT_PATH)"', '"<@(PRODUCT_DIR)/<@(RULE_INPUT_NAME)"'], + 'message': 'Copying binaries...', + }, + ], + }], + ], + }, ], } |