Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: libvpx.gyp

Issue 305533008: libvpx: Update mac and win generated asm offsets dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libvpx.gyp
===================================================================
--- libvpx.gyp (revision 273067)
+++ libvpx.gyp (working copy)
@@ -468,7 +468,12 @@
# 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"', {
+ 'unpack_lib' : '<(PRODUCT_DIR)/libvpx_asm_offsets_vp8.a',
+ },],
+ ['(OS!="win" and OS!="mac")', {
+ # <(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")', {
@@ -487,7 +492,7 @@
{
'action_name': 'copy_enc_offsets_obj',
'inputs': [
- 'copy_obj.py',
+ 'copy_obj.py',
'<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
],
'outputs': [ '<(INTERMEDIATE_DIR)/vp8_asm_enc_offsets.obj' ],
@@ -541,7 +546,8 @@
# 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_vpx_scale,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vpx_scale.a',
- }, {
+ },],
+ ['OS!="win"', {
'unpack_lib' : '<(LIB_DIR)/third_party/libvpx/libvpx_asm_offsets_vpx_scale.a',
},],
['(target_arch=="arm" or target_arch=="armv7")', {
@@ -560,7 +566,7 @@
{
'action_name': 'copy_enc_offsets_obj',
'inputs': [
- 'copy_obj.py',
+ 'copy_obj.py',
'<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
],
'outputs': [ '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.obj' ],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698