1 files changed, 23 insertions, 65 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 741b35b..ff066f1 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -26,9 +26,6 @@
       },
       'target_name': 'ffmpeg',
       'msvs_guid': 'D7A94F58-576A-45D9-A45F-EB87C63ABBB0',
-      'dependencies': [
-        'ffmpeg_binaries',
-      ],
       'sources': [
         'include/libavcodec/avcodec.h',
         'include/libavcodec/opt.h',
@@ -72,6 +69,9 @@
               'intermediate_dir': '<(INTERMEDIATE_DIR)',
             },
             'type': 'none',
+            'dependencies': [
+              'ffmpeg_binaries',
+            ],
             'sources!': [
               '<(extra_header)',
             ],
@@ -175,70 +175,28 @@
       'msvs_guid': '4E4070E1-EFD9-4EF1-8634-3960956F6F10',
       'conditions': [
         ['OS=="win"', {
-          'variables': {
-            'source_files': [
-              'binaries/avcodeec-52.dll',
-              'binaries/avformat-52.dll',
-              'binaries/avutil-50.dll',
-              'binaries/pthreadGC2.dll',
-            ],
-            'output_files': [
-              '<(PRODUCT_DIR)/avcodec-52.dll',
-              '<(PRODUCT_DIR)/avformat-52.dll',
-              '<(PRODUCT_DIR)/avutil-50.dll',
-              '<(PRODUCT_DIR)/pthreadGC2.dll',
-            ],
-          },
-          'dependencies': ['../../build/win/system.gyp:cygwin'],
-        }], ['OS=="linux"', {
-          'variables': {
-            'source_files': [
-              'binaries/libavcodec.so.52',
-              'binaries/libavformat.so.52',
-              'binaries/libavutil.so.50',
-            ],
-            'output_files': [
-              '<(PRODUCT_DIR)/libavcodec.so.52',
-              '<(PRODUCT_DIR)/libavformat.so.52',
-              '<(PRODUCT_DIR)/libavutil.so.50',
-            ],
-          },
-        }], ['OS=="mac"', {
-          'variables': {
-            'source_files': [
-              'binaries/libavcodec.52.dylib',
-              'binaries/libavformat.52.dylib',
-              'binaries/libavutil.50.dylib',
-            ],
-            'output_files': [
-              '<(PRODUCT_DIR)/libavcodec.52.dylib',
-              '<(PRODUCT_DIR)/libavformat.52.dylib',
-              '<(PRODUCT_DIR)/libavutil.50.dylib',
-            ],
-          },
-        }],
-      ],
-      'sources': [
-        '<@(source_files)',
-      ],
-      'actions': [
-        {
-          'action_name': 'copy_binaries',
-          'extension': 'dll',
-          'inputs': [
-            'copy_binaries.sh',
-            '<@(source_files)',
+          'sources': [
+            'binaries/avcodec-52.dll',
+            'binaries/avformat-52.dll',
+            'binaries/avutil-50.dll',
+            'binaries/pthreadGC2.dll',
           ],
-          'outputs': [
-            '<@(output_files)',
-          ],
-          'action': [
-            './copy_binaries.sh',
-            '<@(source_files)',
-            '<(PRODUCT_DIR)/'
+          '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...',
+            },
           ],
-          'message': 'Copying FFmpeg binaries...',
-        },
+        }],
       ],
     },
   ],