Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MacOSX: Solve conflicting libwebm targets 

When generating ninja files we end up with two libwebm targets.
packager/media/formats/webm/webm.gyp:webm -> becomes target libwebm
packager/third_party/libwebm/libwebm.gyp:libwebm -> becomes target libwebm

Solve this conflict by renaming libwebm.gyp:libwebm to mkvmuxer.
This commit is contained in:
Anders Hasselqvist 2016-01-20 10:57:44 +09:00 committed by KongQun Yang
parent 4195c5e505
commit cb8de4c2f4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/media/formats/webm/webm.gyp
View File

@ -56,7 +56,7 @@
], ],
'dependencies': [ 'dependencies': [
'../../../third_party/boringssl/boringssl.gyp:boringssl', '../../../third_party/boringssl/boringssl.gyp:boringssl',
'../../../third_party/libwebm/libwebm.gyp:libwebm', '../../../third_party/libwebm/libwebm.gyp:mkvmuxer',
'../../base/media_base.gyp:media_base', '../../base/media_base.gyp:media_base',
'../../base/media_base.gyp:widevine_pssh_data_proto', '../../base/media_base.gyp:widevine_pssh_data_proto',
'../../filters/filters.gyp:filters' '../../filters/filters.gyp:filters'

2
packager/third_party/libwebm/libwebm.gyp vendored
View File

@ -9,7 +9,7 @@
], ],
'targets': [ 'targets': [
{ {
'target_name': 'libwebm', 'target_name': 'mkvmuxer',
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
'src/mkvmuxer.cpp', 'src/mkvmuxer.cpp',