OLD | NEW |
---|---|
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'conditions': [ | 7 'conditions': [ |
8 ['((OS=="android" or chromeos==1) and (target_arch=="arm" or target_arch== "arm64")) or (OS=="ios" and target_arch=="armv7")', { | |
Sergey Ulanov
2014/06/04 02:47:24
Can this be simply 'target_arch=="arm" or target_a
Solis
2014/06/04 15:04:04
l.776, l.845 of build/common.gypi mentions linux b
| |
9 'use_opus_fixed_point%': 1, | |
10 }, { | |
11 'use_opus_fixed_point%': 0, | |
12 }], | |
8 ['((OS=="android" or chromeos==1) and target_arch=="arm") or (OS=="ios" an d target_arch=="armv7")', { | 13 ['((OS=="android" or chromeos==1) and target_arch=="arm") or (OS=="ios" an d target_arch=="armv7")', { |
9 'use_opus_fixed_point%': 1, | |
10 'use_opus_arm_optimization%': 1, | 14 'use_opus_arm_optimization%': 1, |
11 }, { | 15 }, { |
12 'use_opus_fixed_point%': 0, | |
13 'use_opus_arm_optimization%': 0, | 16 'use_opus_arm_optimization%': 0, |
14 }], | 17 }], |
15 ['(OS=="android" or chromeos==1) and target_arch=="arm"', { | 18 ['(OS=="android" or chromeos==1) and target_arch=="arm"', { |
16 'use_opus_rtcd%': 1, | 19 'use_opus_rtcd%': 1, |
17 }, { | 20 }, { |
18 'use_opus_rtcd%': 0, | 21 'use_opus_rtcd%': 0, |
19 }], | 22 }], |
20 ], | 23 ], |
21 }, | 24 }, |
22 'targets': [ | 25 'targets': [ |
(...skipping 25 matching lines...) Expand all Loading... | |
48 }, { | 51 }, { |
49 'defines': [ | 52 'defines': [ |
50 'USE_ALLOCA', | 53 'USE_ALLOCA', |
51 'inline=__inline', | 54 'inline=__inline', |
52 ], | 55 ], |
53 'msvs_disabled_warnings': [ | 56 'msvs_disabled_warnings': [ |
54 4305, # Disable truncation warning in celt/pitch.c . | 57 4305, # Disable truncation warning in celt/pitch.c . |
55 4334, # Disable 32-bit shift warning in src/opus_encoder.c . | 58 4334, # Disable 32-bit shift warning in src/opus_encoder.c . |
56 ], | 59 ], |
57 }], | 60 }], |
58 [ 'os_posix==1 and OS!="android"', { | 61 ['os_posix==1 and OS!="android"', { |
59 # Suppress a warning given by opus_decoder.c that tells us | 62 # Suppress a warning given by opus_decoder.c that tells us |
60 # optimizations are turned off. | 63 # optimizations are turned off. |
61 'cflags': [ | 64 'cflags': [ |
62 '-Wno-#pragma-messages', | 65 '-Wno-#pragma-messages', |
63 ], | 66 ], |
64 'xcode_settings': { | 67 'xcode_settings': { |
65 'WARNING_CFLAGS': [ | 68 'WARNING_CFLAGS': [ |
66 '-Wno-#pragma-messages', | 69 '-Wno-#pragma-messages', |
67 ], | 70 ], |
68 }, | 71 }, |
69 }], | 72 }], |
73 ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', { | |
74 'cflags!': ['-Os'], | |
75 'cflags': ['-O3'], | |
Sergey Ulanov
2014/06/04 02:47:24
You can set release_optimize=3 instead of adding f
Solis
2014/06/04 15:04:04
Setting release_optimize in ffmpeg.gyp doesn't app
Sergey Ulanov
2014/06/04 17:55:55
You need to set it in this file, not if ffmpeg.gyp
Solis
2014/06/04 19:55:43
As discussed over chat, there was a bug in common.
| |
76 }], | |
70 ['use_opus_fixed_point==0', { | 77 ['use_opus_fixed_point==0', { |
71 'include_dirs': [ | 78 'include_dirs': [ |
72 'src/silk/float', | 79 'src/silk/float', |
73 ], | 80 ], |
74 'sources/': [ | 81 'sources/': [ |
75 ['exclude', '/fixed/[^/]*_FIX.(h|c)$'], | 82 ['exclude', '/fixed/[^/]*_FIX.(h|c)$'], |
76 ], | 83 ], |
77 }, { | 84 }, { |
78 'defines': [ | 85 'defines': [ |
79 'FIXED_POINT', | 86 'FIXED_POINT', |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
135 'sources': [ | 142 'sources': [ |
136 'src/src/opus_demo.c', | 143 'src/src/opus_demo.c', |
137 ], | 144 ], |
138 'include_dirs': [ | 145 'include_dirs': [ |
139 'src/celt', | 146 'src/celt', |
140 'src/silk', | 147 'src/silk', |
141 ], | 148 ], |
142 }, # target opus_demo | 149 }, # target opus_demo |
143 ] | 150 ] |
144 } | 151 } |
OLD | NEW |