| Index: libvpx.gyp
|
| ===================================================================
|
| --- libvpx.gyp (revision 273247)
|
| +++ libvpx.gyp (working copy)
|
| @@ -468,14 +468,14 @@
|
| # pass the empty string for 3rd and 4th arguments of
|
| # intermediates-dir-for macro.
|
| 'unpack_lib' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a',
|
| - },],
|
| - ['OS=="mac"', {
|
| + }],
|
| + ['OS=="mac" or OS=="ios"', {
|
| 'unpack_lib' : '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.a',
|
| - },],
|
| - ['(OS!="win" and OS!="mac")', {
|
| + }],
|
| + ['OS!="win" and OS!="mac" and OS!="ios"', {
|
| # <(LIB_DIR) not defined for "win".
|
| 'unpack_lib' : '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vp8.a',
|
| - },],
|
| + }],
|
| ['(target_arch=="arm" or target_arch=="armv7")', {
|
| 'output_format': 'gas',
|
| }, {
|
|
|