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

Unified Diff: libvpx.gyp

Issue 8244015: Fix build with system yasm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 9 years, 2 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 103347)
+++ libvpx.gyp (working copy)
@@ -96,7 +96,6 @@
'variables': {
'shared_generated_dir':
'<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
- 'yasm_path': '<(PRODUCT_DIR)/yasm',
'conditions': [
[ 'OS=="linux" and target_arch=="ia32"', {
'yasm_flags': [
@@ -131,10 +130,19 @@
'-I', 'source/libvpx',
],
}],
+ [ 'use_system_yasm==0', {
+ 'yasm_path': '<(PRODUCT_DIR)/yasm',
+ }, { # use_system_yasm == 1
+ 'yasm_path': '<!(which yasm)',
+ }],
],
},
- 'dependencies': [
- '../yasm/yasm.gyp:yasm#host',
+ 'conditions': [
+ [ 'use_system_yasm==0', {
+ 'dependencies': [
+ '../yasm/yasm.gyp:yasm#host',
+ ],
+ }],
],
'include_dirs': [
'source/config/<(OS)/<(target_arch)',
« 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