generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor the gyp file to gypi file.

Browse Source 
Basically, the gypi file is a copy of gyp file, but has some difference on the
path of the dependencies.
Review URL: http://webrtc-codereview.appspot.com/137020

git-svn-id: http://webrtc.googlecode.com/svn/trunk@581 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
xians@google.com
2011-09-12 12:24:39 +00:00
parent 0cc68dc38a
commit d3185fe219
59 changed files with 634 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/modules/audio_coding/NetEQ/main/source/neteq.gyp → src/modules/audio_coding/NetEQ/main/source/neteq.gypi
View File

@@ -7,20 +7,17 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'NetEq',
'type': '<(library)',
'dependencies': [
'../../../codecs/CNG/main/source/cng.gyp:CNG',
'../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
'CNG',
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'defines': [
'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which specifies a subset of codecs to support
'SCRATCH',
'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which
'SCRATCH', # specifies a subset of codecs to support.
],
'include_dirs': [
'../interface',
@@ -97,12 +94,12 @@
'dependencies': [
'NetEq', # NetEQ library defined above
'NetEqTestTools',# Test helpers
'../../../codecs/G711/main/source/g711.gyp:G711',
'../../../codecs/G722/main/source/g722.gyp:G722',
'../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B',
'../../../codecs/iLBC/main/source/ilbc.gyp:iLBC',
'../../../codecs/iSAC/main/source/isac.gyp:iSAC',
'../../../codecs/CNG/main/source/cng.gyp:CNG',
'G711',
'G722',
'PCM16B',
'iLBC',
'iSAC',
'CNG',
],
'defines': [
# TODO: Make codec selection conditional on definitions in target NetEq
@@ -121,7 +118,7 @@
'CODEC_RED',
],
'include_dirs': [
'../source',
'./',
'../test',
],
'sources': [
@@ -133,13 +130,13 @@
'type': 'executable',
'dependencies': [
'NetEqTestTools',# Test helpers
'../../../codecs/G711/main/source/g711.gyp:G711',
'../../../codecs/G722/main/source/g722.gyp:G722',
'../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B',
'../../../codecs/iLBC/main/source/ilbc.gyp:iLBC',
'../../../codecs/iSAC/main/source/isac.gyp:iSAC',
'../../../codecs/CNG/main/source/cng.gyp:CNG',
'../../../../../common_audio/vad/main/source/vad.gyp:vad',
'G711',
'G722',
'PCM16B',
'iLBC',
'iSAC',
'CNG',
'<(webrtc_root)/common_audio/common_audio.gyp:vad',
],
'defines': [
# TODO: Make codec selection conditional on definitions in target NetEq
@@ -239,16 +236,16 @@
# Collection of useful functions used in other tests
'type': '<(library)',
'dependencies': [
'../../../codecs/G711/main/source/g711.gyp:G711',
'../../../codecs/G722/main/source/g722.gyp:G722',
'../../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B',
'../../../codecs/iLBC/main/source/ilbc.gyp:iLBC',
'../../../codecs/iSAC/main/source/isac.gyp:iSAC',
'../../../codecs/CNG/main/source/cng.gyp:CNG',
'G711',
'G722',
'PCM16B',
'iLBC',
'iSAC',
'CNG',
],
'direct_dependent_settings': {
'include_dirs': [
'../test',
'../test',
'../interface',
],
},
@@ -269,7 +266,7 @@
'CODEC_RED',
],
'include_dirs': [
'../source',
'./',
'../interface',
'../test',
],

5
src/modules/audio_coding/codecs/CNG/main/source/cng.gyp → src/modules/audio_coding/codecs/CNG/main/source/cng.gypi
View File

@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'CNG',
'type': '<(library)',
'dependencies': [
'../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',

3
src/modules/audio_coding/codecs/G711/main/source/g711.gyp → src/modules/audio_coding/codecs/G711/main/source/g711.gypi
View File

@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'G711',

3
src/modules/audio_coding/codecs/G722/main/source/g722.gyp → src/modules/audio_coding/codecs/G722/main/source/g722.gypi
View File

@@ -6,9 +6,6 @@
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'G722',

3
src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gyp → src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gypi
View File

@@ -7,9 +7,6 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'PCM16B',

5
src/modules/audio_coding/codecs/iLBC/ilbc_test.gyp → src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi
View File

@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [
# ilbc_test
{
'target_name': 'iLBCtest',
'type': 'executable',
'dependencies': [
'./main/source/ilbc.gyp:iLBC',
'iLBC',
],
'include_dirs': [
'./main/interface',

5
src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gyp → src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gypi
View File

@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'iLBC',
'type': '<(library)',
'dependencies': [
'../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',

5
src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gyp → src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gypi
View File

@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'iSACFix',
'type': '<(library)',
'dependencies': [
'../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',

9
src/modules/audio_coding/codecs/iSAC/isac_test.gyp → src/modules/audio_coding/codecs/iSAC/isac_test.gypi
View File

@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [
# simple kenny
{
'target_name': 'iSACtest',
'type': 'executable',
'dependencies': [
'./main/source/isac.gyp:iSAC',
'iSAC',
],
'include_dirs': [
'./main/test',
@@ -33,7 +30,7 @@
'target_name': 'iSACAPITest',
'type': 'executable',
'dependencies': [
'./main/source/isac.gyp:iSAC',
'iSAC',
],
'include_dirs': [
'./main/test',
@@ -50,7 +47,7 @@
'target_name': 'iSACSwitchSampRateTest',
'type': 'executable',
'dependencies': [
'./main/source/isac.gyp:iSAC',
'iSAC',
],
'include_dirs': [
'./main/test',

5
src/modules/audio_coding/codecs/iSAC/isacfix_test.gyp → src/modules/audio_coding/codecs/iSAC/isacfix_test.gypi
View File

@@ -7,16 +7,13 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [
# kenny
{
'target_name': 'iSACFixtest',
'type': 'executable',
'dependencies': [
'./fix/source/isacfix.gyp:iSACFix',
'iSACFix',
],
'include_dirs': [
'./fix/test',

5
src/modules/audio_coding/codecs/iSAC/main/source/isac.gyp → src/modules/audio_coding/codecs/iSAC/main/source/isac.gypi
View File

@@ -7,15 +7,12 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'iSAC',
'type': '<(library)',
'dependencies': [
'../../../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
],
'include_dirs': [
'../interface',

34
src/modules/audio_coding/main/source/audio_coding_module.gyp → src/modules/audio_coding/main/source/audio_coding_module.gypi
View File

@@ -7,26 +7,23 @@
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [
'../../../../common_settings.gypi', # Common settings
],
'targets': [
{
'target_name': 'audio_coding_module',
'type': '<(library)',
'dependencies': [
'../../codecs/CNG/main/source/cng.gyp:CNG',
'../../codecs/G711/main/source/g711.gyp:G711',
'../../codecs/G722/main/source/g722.gyp:G722',
'../../codecs/iLBC/main/source/ilbc.gyp:iLBC',
'../../codecs/iSAC/main/source/isac.gyp:iSAC',
'../../codecs/iSAC/fix/source/isacfix.gyp:iSACFix',
'../../codecs/PCM16B/main/source/pcm16b.gyp:PCM16B',
'../../NetEQ/main/source/neteq.gyp:NetEq',
'../../../../common_audio/resampler/main/source/resampler.gyp:resampler',
'../../../../common_audio/signal_processing_library/main/source/spl.gyp:spl',
'../../../../common_audio/vad/main/source/vad.gyp:vad',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
'CNG',
'G711',
'G722',
'iLBC',
'iSAC',
'iSACFix',
'PCM16B',
'NetEq',
'<(webrtc_root)/common_audio/common_audio.gyp:resampler',
'<(webrtc_root)/common_audio/common_audio.gyp:spl',
'<(webrtc_root)/common_audio/common_audio.gyp:vad',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'../interface',
@@ -34,12 +31,11 @@
],
'direct_dependent_settings': {
'include_dirs': [
'../interface',
'../../../interface',
'../interface',
'../../../interface',
],
},
'sources': [
# TODO: Remove files from here and P4 when ACM is slimmed down.
'../interface/audio_coding_module.h',
'../interface/audio_coding_module_typedefs.h',
'acm_amr.cc',
@@ -104,7 +100,7 @@
'type': 'executable',
'dependencies': [
'audio_coding_module',
'../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
'../test/ACMTest.cpp',