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

Unified Diff: libvpx.gyp

Issue 8666017: Build libvpx on non-Mac POSIX platforms (Closed) Base URL: http://git.chromium.org/chromium/deps/libvpx.git@master
Patch Set: Created 9 years, 1 month 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
diff --git a/libvpx.gyp b/libvpx.gyp
index 9fce1083420f278ee02b8ae6251a9471c0df6911..2a065ae2522f76957039cff656e1a59dce6e1855 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -13,7 +13,7 @@
],
},
'conditions': [
- [ '(OS=="linux" or OS=="mac" or OS=="win") and target_arch!="arm"', {
+ [ 'OS != "android" and target_arch != "arm"', {
'targets': [
{
# This libvpx target contains both encoder and decoder.
@@ -22,8 +22,17 @@
'type': 'static_library',
'variables': {
'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
+ 'variables': {
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac"', {
+ '_OS%': 'linux',
Ami GONE FROM CHROMIUM 2011/11/23 09:14:11 I'm shocked that reusing the linux config happens
ruben 2011/11/23 10:07:41 The linux and mac ia32 configs only differ by 6 li
Ami GONE FROM CHROMIUM 2011/11/23 17:03:39 It would be interesting to know whether the other
ruben 2011/11/23 18:55:53 The library is only compiled at this point, so no
Ami GONE FROM CHROMIUM 2011/11/23 19:09:43 FTR chromium switched from libvpx to ffvp8 for vid
ruben 2011/11/23 19:33:12 Yeah, after you mentioned it earlier, I checked th
+ }, {
+ '_OS%': '<(OS)',
+ }],
+ ]},
+ '_OS%': '<(_OS)',
'yasm_flags': [
- '-I', 'source/config/<(OS)/<(target_arch)',
+ '-I', 'source/config/<(_OS)/<(target_arch)',
'-I', 'source/libvpx',
],
},
@@ -31,7 +40,7 @@
'../yasm/yasm_compile.gypi'
],
'include_dirs': [
- 'source/config/<(OS)/<(target_arch)',
+ 'source/config/<(_OS)/<(target_arch)',
'source/libvpx',
'source/libvpx/vp8/common',
'source/libvpx/vp8/decoder',
« 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