summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2014-02-24 07:29:32 -0800
committerAndras Becsi <andras.becsi@digia.com>2014-06-04 18:18:07 +0200
commit7cd1fdca26906f177351fc6088fb1f45a5f35b55 (patch)
tree5a446110b1a0f8e326f8f133ca2b72d7d1f1c04d
parentfc564eb88ba94e33099cc2bc1a1a80dabe37ded5 (diff)
<third_party/libvpx> LIBVPX: Add path for QtWebEngine build in Windows specific actions
Change-Id: I1bcc9cbb77b10e9e60d60900b9cfd8ce283947b0 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--chromium/third_party/libvpx/libvpx.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/third_party/libvpx/libvpx.gyp b/chromium/third_party/libvpx/libvpx.gyp
index 3f668df2eeb..32a4bb10afa 100644
--- a/chromium/third_party/libvpx/libvpx.gyp
+++ b/chromium/third_party/libvpx/libvpx.gyp
@@ -404,6 +404,7 @@
'-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vp8/vp8_asm_enc_offsets.obj',
'-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
'-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
+ '-s', '<(qtwe_chromium_obj_dir)/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
],
'process_output_as_sources': 1,
'msvs_cygwin_shell': 1,
@@ -502,6 +503,7 @@
'-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vpx_scale/vpx_scale_asm_offsets.obj',
'-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
'-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
+ '-s', '<(qtwe_chromium_obj_dir)/third_party/libvpx/<(libvpx_source)/vpx_scale/libvpx_asm_offsets_vpx_scale.vpx_scale_asm_offsets.obj',
],
'process_output_as_sources': 1,
'msvs_cygwin_shell': 1,