wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 749889 and Bug 688178: Make webrtc build without referencing third_party modules not in first tranche r=ted

Browse Source
This commit is contained in:
Randell Jesup 2012-06-20 07:27:50 -04:00
parent b21f99bd33
commit ca925c1bd9
6 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
media/webrtc/shared_libs.mk
View File

@ -4,11 +4,6 @@
# shared libs for webrtc
SHARED_LIBRARY_LIBS += \
$(call EXPAND_LIBNAME_PATH,jingle,$(DEPTH)/media/webrtc/trunk/third_party/libjingle/libjingle_libjingle) \
$(call EXPAND_LIBNAME_PATH,srtp,$(DEPTH)/media/webrtc/trunk/third_party/libsrtp/libsrtp_libsrtp) \
$(call EXPAND_LIBNAME_PATH,jingle_p2p,$(DEPTH)/media/webrtc/trunk/third_party/libjingle/libjingle_libjingle_p2p) \
$(call EXPAND_LIBNAME_PATH,jingle_app,$(DEPTH)/media/webrtc/trunk/third_party/libjingle/libjingle_libjingle_app) \
$(call EXPAND_LIBNAME_PATH,jsoncpp,$(DEPTH)/media/webrtc/trunk/third_party/jsoncpp/jsoncpp_jsoncpp) \
$(call EXPAND_LIBNAME_PATH,video_capture_module,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_capture_module) \
$(call EXPAND_LIBNAME_PATH,webrtc_utility,$(DEPTH)/media/webrtc/trunk/src/modules/modules_webrtc_utility) \
$(call EXPAND_LIBNAME_PATH,audio_coding_module,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_coding_module) \
@ -46,13 +41,5 @@ SHARED_LIBRARY_LIBS += \
$(call EXPAND_LIBNAME_PATH,agc,$(DEPTH)/media/webrtc/trunk/src/modules/modules_agc) \
$(call EXPAND_LIBNAME_PATH,ns,$(DEPTH)/media/webrtc/trunk/src/modules/modules_ns) \
$(call EXPAND_LIBNAME_PATH,yuv,$(DEPTH)/media/webrtc/trunk/third_party/libyuv/libyuv_libyuv) \
$(call EXPAND_LIBNAME_PATH,expat,$(DEPTH)/media/webrtc/trunk/third_party/expat/expat_expat) \
$(call EXPAND_LIBNAME_PATH,webrtc_jpeg,$(DEPTH)/media/webrtc/trunk/src/common_video/common_video_webrtc_jpeg) \
$(NULL)
ifneq ($(OS_TARGET),WINNT)
SHARED_LIBRARY_LIBS += \
$(call EXPAND_LIBNAME_PATH,sipcc,$(DEPTH)/media/webrtc/signaling/signaling_sipcc) \
$(call EXPAND_LIBNAME_PATH,ecc,$(DEPTH)/media/webrtc/signaling/signaling_ecc) \
$(NULL)
endif

10
media/webrtc/trunk/peerconnection.gyp
View File

@ -30,7 +30,15 @@
'message': 'Generating scream',
}, ],
'dependencies': [
'third_party/libjingle/libjingle.gyp:libjingle_app',
# allow building without libjingle
# 'third_party/libjingle/libjingle.gyp:libjingle_app',
'src/modules/modules.gyp:audio_device',
'src/modules/modules.gyp:video_capture_module',
'src/modules/modules.gyp:video_render_module',
'src/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'src/video_engine/video_engine.gyp:video_engine_core',
'src/voice_engine/voice_engine.gyp:voice_engine_core',
# '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
],
}, ],
],

2
media/webrtc/trunk/src/build/common.gypi
View File

@ -42,7 +42,7 @@
'enable_data_logging%': 0,
# Disable these to not build components which can be externally provided.
'build_libjpeg%': 1,
'build_libjpeg%': 0,
'build_libyuv%': 1,
'conditions': [

2
media/webrtc/trunk/src/modules/modules.gyp
View File

@ -41,7 +41,7 @@
# Test targets, excluded when building with Chromium.
'conditions': [
['build_with_chromium==0', {
['build_with_chromium==0 and build_with_mozilla==0', {
'includes': [
'audio_coding/codecs/iSAC/isac_test.gypi',
'audio_coding/codecs/iSAC/isacfix_test.gypi',

2
media/webrtc/trunk/src/modules/video_coding/codecs/vp8/main/source/vp8.gypi
View File

@ -82,7 +82,7 @@
], # targets
# Exclude the test target when building with chromium.
'conditions': [
['build_with_chromium==0', {
['build_with_chromium==0 and build_with_mozilla==0', {
'targets': [
{
'target_name': 'vp8_test',

2
media/webrtc/trunk/src/video_engine/video_engine.gyp
View File

@ -14,7 +14,7 @@
# Test targets, excluded when building with Chromium.
'conditions': [
['build_with_chromium==0', {
['build_with_chromium==0 and build_with_mozilla==0', {
'includes': [
'test/libvietest/libvietest.gypi',
'test/auto_test/vie_auto_test.gypi',