speex.gyp - Issue 14623014: Remove use_system_speex logic from the mainline gyp file.

Unified Diff: speex.gyp

Issue 14623014: Remove use_system_speex logic from the mainline gyp file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/speex/

Patch Set: Created 7 years, 8 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

Index: speex.gyp

===================================================================

--- speex.gyp (revision 197996)

+++ speex.gyp (working copy)

@@ -3,134 +3,87 @@

# found in the LICENSE file.

{

- 'variables': {

- 'use_system_speex%': 0,

- },

- 'conditions': [

- ['use_system_speex==0', {

- 'targets': [

- {

- 'target_name': 'libspeex',

- 'product_name': 'speex',

- 'type': 'static_library',

- 'sources': [

- 'libspeex/arch.h',

- 'libspeex/bits.c',

- 'libspeex/cb_search.c',

- 'libspeex/cb_search.h',

- 'libspeex/exc_10_16_table.c',

- 'libspeex/exc_10_32_table.c',

- 'libspeex/exc_20_32_table.c',

- 'libspeex/exc_5_256_table.c',

- 'libspeex/exc_5_64_table.c',

- 'libspeex/exc_8_128_table.c',

- 'libspeex/filters.c',

- 'libspeex/filters.h',

- 'libspeex/gain_table.c',

- 'libspeex/gain_table_lbr.c',

- 'libspeex/hexc_10_32_table.c',

- 'libspeex/hexc_table.c',

- 'libspeex/high_lsp_tables.c',

- 'libspeex/lpc.c',

- 'libspeex/lpc.h',

- 'libspeex/lsp.c',

- 'libspeex/lsp.h',

- 'libspeex/lsp_tables_nb.c',

- 'libspeex/ltp.c',

- 'libspeex/ltp.h',

- 'libspeex/math_approx.h',

- 'libspeex/modes.c',

- 'libspeex/modes.h',

- 'libspeex/modes_wb.c',

- 'libspeex/nb_celp.c',

- 'libspeex/nb_celp.h',

- 'libspeex/os_support.h',

- 'libspeex/pseudofloat.h',

- 'libspeex/quant_lsp.c',

- 'libspeex/quant_lsp.h',

- 'libspeex/sb_celp.c',

- 'libspeex/sb_celp.h',

- 'libspeex/speex.c',

- 'libspeex/speex_callbacks.c',

- 'libspeex/speex_header.c',

- 'libspeex/stack_alloc.h',

- 'libspeex/stereo.c',

- 'libspeex/vbr.c',

- 'libspeex/vbr.h',

- 'libspeex/vq.c',

- 'libspeex/vq.h',

- 'libspeex/window.c',

- 'include/speex/speex.h',

- 'include/speex/speex_bits.h',

- 'include/speex/speex_buffer.h',

- 'include/speex/speex_callbacks.h',

- 'include/speex/speex_echo.h',

- 'include/speex/speex_header.h',

- 'include/speex/speex_jitter.h',

- 'include/speex/speex_preprocess.h',

- 'include/speex/speex_resampler.h',

- 'include/speex/speex_stereo.h',

- 'include/speex/speex_types.h',

- ],

- 'defines': [

- 'FLOATING_POINT',

- 'EXPORT=',

- 'USE_ALLOCA',

- 'inline=__inline',

- ],

- 'include_dirs': [

- 'include',

- 'libspeex',

- ],

- 'direct_dependent_settings': {

- 'include_dirs': [

- 'include', # Clients expect <speex/speex.h> to be a system header.

- ],

- },

- 'msvs_disabled_warnings': [4244, 4305],

- },

+ 'targets': [

+ {

+ 'target_name': 'libspeex',

+ 'product_name': 'speex',

+ 'type': 'static_library',

+ 'sources': [

+ 'libspeex/arch.h',

+ 'libspeex/bits.c',

+ 'libspeex/cb_search.c',

+ 'libspeex/cb_search.h',

+ 'libspeex/exc_10_16_table.c',

+ 'libspeex/exc_10_32_table.c',

+ 'libspeex/exc_20_32_table.c',

+ 'libspeex/exc_5_256_table.c',

+ 'libspeex/exc_5_64_table.c',

+ 'libspeex/exc_8_128_table.c',

+ 'libspeex/filters.c',

+ 'libspeex/filters.h',

+ 'libspeex/gain_table.c',

+ 'libspeex/gain_table_lbr.c',

+ 'libspeex/hexc_10_32_table.c',

+ 'libspeex/hexc_table.c',

+ 'libspeex/high_lsp_tables.c',

+ 'libspeex/lpc.c',

+ 'libspeex/lpc.h',

+ 'libspeex/lsp.c',

+ 'libspeex/lsp.h',

+ 'libspeex/lsp_tables_nb.c',

+ 'libspeex/ltp.c',

+ 'libspeex/ltp.h',

+ 'libspeex/math_approx.h',

+ 'libspeex/modes.c',

+ 'libspeex/modes.h',

+ 'libspeex/modes_wb.c',

+ 'libspeex/nb_celp.c',

+ 'libspeex/nb_celp.h',

+ 'libspeex/os_support.h',

+ 'libspeex/pseudofloat.h',

+ 'libspeex/quant_lsp.c',

+ 'libspeex/quant_lsp.h',

+ 'libspeex/sb_celp.c',

+ 'libspeex/sb_celp.h',

+ 'libspeex/speex.c',

+ 'libspeex/speex_callbacks.c',

+ 'libspeex/speex_header.c',

+ 'libspeex/stack_alloc.h',

+ 'libspeex/stereo.c',

+ 'libspeex/vbr.c',

+ 'libspeex/vbr.h',

+ 'libspeex/vq.c',

+ 'libspeex/vq.h',

+ 'libspeex/window.c',

+ 'include/speex/speex.h',

+ 'include/speex/speex_bits.h',

+ 'include/speex/speex_buffer.h',

+ 'include/speex/speex_callbacks.h',

+ 'include/speex/speex_echo.h',

+ 'include/speex/speex_header.h',

+ 'include/speex/speex_jitter.h',

+ 'include/speex/speex_preprocess.h',

+ 'include/speex/speex_resampler.h',

+ 'include/speex/speex_stereo.h',

+ 'include/speex/speex_types.h',

- }, { # use_system_speex != 0

- 'targets': [

- {

- 'target_name': 'libspeex',

- 'type': 'none',

- 'variables': {

- 'headers_root_path': 'include',

- 'header_filenames': [

- 'speex/speex_types.h',

- 'speex/speex_callbacks.h',

- 'speex/speex_config_types.h',

- 'speex/speex_stereo.h',

- 'speex/speex_echo.h',

- 'speex/speex_preprocess.h',

- 'speex/speex_jitter.h',

- 'speex/speex.h',

- 'speex/speex_resampler.h',

- 'speex/speex_buffer.h',

- 'speex/speex_header.h',

- 'speex/speex_bits.h',

- ],

- },

- 'includes': [

- '../../build/shim_headers.gypi',

- ],

- 'direct_dependent_settings': {

- 'cflags': [

- '<!@(pkg-config --cflags speex)',

- ],

- },

- 'link_settings': {

- 'ldflags': [

- '<!@(pkg-config --libs-only-L --libs-only-other speex)',

- ],

- 'libraries': [

- '<!@(pkg-config --libs-only-l speex)',

- ],

- },

+ 'defines': [

+ 'FLOATING_POINT',

+ 'EXPORT=',

+ 'USE_ALLOCA',

+ 'inline=__inline',

- }],

+ 'include_dirs': [

+ 'include',

+ 'libspeex',

+ ],

+ 'direct_dependent_settings': {

+ 'include_dirs': [

+ 'include', # Clients expect <speex/speex.h> to be a system header.

+ ],

+ },

+ 'msvs_disabled_warnings': [4244, 4305],

+ },

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »