Changeset 211875 in webkit


Ignore:
Timestamp:
Feb 8, 2017, 9:16:41 AM (8 years ago)
Author:
achristensen@apple.com
Message:

[WebRTC] Fix libwebrtc build system
​https://bugs.webkit.org/show_bug.cgi?id=167978

Patch by Youenn Fablet <​youennf@gmail.com> on 2017-02-08
Reviewed by Alex Christensen.

  • Configurations/libwebrtc.xcconfig:
  • Configurations/libwebrtcpcrtc.xcconfig:
  • Configurations/usrsctp.xcconfig:
  • libwebrtc.xcodeproj/project.pbxproj:
Location:
trunk/Source/ThirdParty/libwebrtc
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r211849 r211875  
     12017-02-08  Youenn Fablet  <youennf@gmail.com>
     2
     3        [WebRTC] Fix libwebrtc build system
     4        https://bugs.webkit.org/show_bug.cgi?id=167978
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Configurations/libwebrtc.xcconfig:
     9        * Configurations/libwebrtcpcrtc.xcconfig:
     10        * Configurations/usrsctp.xcconfig:
     11        * libwebrtc.xcodeproj/project.pbxproj:
     12
    1132017-02-07  Youenn Fablet  <youenn@apple.com>
    214

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig

    r211664 r211875  
    77COMBINE_HIDPI_IMAGES = NO;
    88ENABLE_STRICT_OBJC_MSGSEND = YES;
    9 HEADER_SEARCH_PATHS = Source Source/third_party/jsoncpp/source/include Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/third_party/usrsctp/usrsctplib Source/third_party/usrsctp/usrsctplib/usrsctplib Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac;
     9HEADER_SEARCH_PATHS = Source Source/third_party/jsoncpp/source/include Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/third_party/usrsctp/usrsctplib Source/third_party/usrsctp/usrsctplib/usrsctplib Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/;
     10
    1011INSTALL_PATH = /usr/local/lib;
    1112PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc;
    … …  
    1314WARNING_CFLAGS = -Wno-exit-time-destructors -Wno-objc-property-no-attribute -Wno-objc-missing-super-calls;
    1415
    15 // FIXME: WEBRTC_CODEC_G722 was in project.json
    16 GCC_PREPROCESSOR_DEFINITIONS = WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP=1 HAVE_OPENSSL_SSL_H=1 SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_CODEC_ILBC WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED RTC_DISABLE_VP9 RTC_DISABLE_VP8 HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;
     16GCC_PREPROCESSOR_DEFINITIONS = WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP HAVE_OPENSSL_SSL_H SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_CODEC_ILBC WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED RTC_DISABLE_VP9 RTC_DISABLE_VP8 HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE HAVE_SCTP;

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtcpcrtc.xcconfig

    r211849 r211875  
    1414WARNING_CFLAGS = -Wno-exit-time-destructors -Wno-objc-property-no-attribute -Wno-objc-missing-super-calls;
    1515
    16 // FIXME: WEBRTC_CODEC_G722 was in project.json
    17 GCC_PREPROCESSOR_DEFINITIONS = WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP=1 HAVE_OPENSSL_SSL_H=1 SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_CODEC_ILBC WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED RTC_DISABLE_VP9 RTC_DISABLE_VP8 HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE;
     16GCC_PREPROCESSOR_DEFINITIONS = WEBRTC_POSIX WEBRTC_MAC SSL_USE_OPENSSL FEATURE_ENABLE_SSL HAVE_SRTP HAVE_OPENSSL_SSL_H SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin NON_WINDOWS_DEFINE HAVE_WEBRTC_VIDEO HAVE_WEBRTC_VOICE WEBRTC_INTELLIGIBILITY_ENHANCER=0 WEBRTC_APM_DEBUG_DUMP=0 WEBRTC_NS_FLOAT WEBRTC_CODEC_ILBC WEBRTC_CODEC_OPUS WEBRTC_CODEC_ISAC WEBRTC_CODEC_RED RTC_DISABLE_VP9 RTC_DISABLE_VP8 HAVE_STDINT_H HAVE_STDLIB_H HAVE_UINT64_T OPENSSL HAVE_CONFIG_H WEBRTC_WEBKIT_BUILD HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE HAVE_SCTP;

  • trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig

    r211844 r211875  
    77COMBINE_HIDPI_IMAGES = NO;
    88ENABLE_STRICT_OBJC_MSGSEND = YES;
    9 HEADER_SEARCH_PATHS = Source/third_party/usrsctp/usrsctplib/usrsctplib;
     9HEADER_SEARCH_PATHS = Source/ Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/ Source/third_party/usrsctp/usrsctplib/usrsctplib/ Source/third_party/boringssl/src/include/;
    1010INSTALL_PATH = /usr/local/lib;
    1111PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc;
    1212USE_HEADERMAP = NO;
    1313WARNING_CFLAGS = -Wno-exit-time-destructors -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-deprecated-declarations;
    14 GCC_PREPROCESSOR_DEFINITIONS = __Userspace_os_Darwin SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292;
     14GCC_PREPROCESSOR_DEFINITIONS = SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin;
    1515OTHER_CFLAGS = -UINET -UINET6 -U__APPLE__;

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r211847 r211875  
    2222
    2323/* Begin PBXBuildFile section */
     24                414D71141E4AE98C0023E526 /* user_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 414D71121E4AE9820023E526 /* user_socket.c */; };
     25                414D71171E4AEAFB0023E526 /* sctp_indata.c in Sources */ = {isa = PBXBuildFile; fileRef = 414D71151E4AEACD0023E526 /* sctp_indata.c */; };
     26                414D71191E4AEB110023E526 /* sctp_userspace.c in Sources */ = {isa = PBXBuildFile; fileRef = 414D71181E4AEB110023E526 /* sctp_userspace.c */; };
    2427                5C0884E31E4A986000403995 /* compare.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D341E4323D4002651C8 /* compare.cc */; };
    2528                5C0884E41E4A986000403995 /* compare_common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D2F1E4323D4002651C8 /* compare_common.cc */; };
    … …  
    26922695
    26932696/* Begin PBXFileReference section */
     2697                414D71121E4AE9820023E526 /* user_socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = user_socket.c; sourceTree = "<group>"; };
     2698                414D71151E4AEACD0023E526 /* sctp_indata.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sctp_indata.c; path = netinet/sctp_indata.c; sourceTree = "<group>"; };
     2699                414D71181E4AEB110023E526 /* sctp_userspace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sctp_userspace.c; path = netinet/sctp_userspace.c; sourceTree = "<group>"; };
    26942700                5C0884891E4A978C00403995 /* libsrtp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libsrtp.xcconfig; sourceTree = "<group>"; };
    26952701                5C08848A1E4A978C00403995 /* libyuv.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libyuv.xcconfig; sourceTree = "<group>"; };
    … …  
    62626268                                5C4B4AD61E42C9D6002651C8 /* user_recv_thread.h */,
    62636269                                5C4B4AD71E42C9D6002651C8 /* user_route.h */,
     6270                                414D71121E4AE9820023E526 /* user_socket.c */,
    62646271                                5C4B4AD91E42C9D6002651C8 /* user_socketvar.h */,
    62656272                                5C4B4ADA1E42C9D6002651C8 /* user_uma.h */,
    … …  
    62806287                        isa = PBXGroup;
    62816288                        children = (
     6289                                414D71181E4AEB110023E526 /* sctp_userspace.c */,
     6290                                414D71151E4AEACD0023E526 /* sctp_indata.c */,
    62826291                                5C4B4B151E42C9EF002651C8 /* sctp.h */,
    62836292                                5C4B4AEE1E42C9EF002651C8 /* sctp_asconf.c */,
    … …  
    1052310532                        buildActionMask = 2147483647;
    1052410533                        files = (
     10534                                414D71141E4AE98C0023E526 /* user_socket.c in Sources */,
    1052510535                                5C6024971E4950A50088F0B2 /* sctp6_usrreq.c in Sources */,
    1052610536                                5C6024991E4951610088F0B2 /* sctp_pcb.c in Sources */,
     10537                                414D71191E4AEB110023E526 /* sctp_userspace.c in Sources */,
    1052710538                                5C6024661E494DB80088F0B2 /* user_mbuf.c in Sources */,
    1052810539                                5C6024701E4950A00088F0B2 /* sctp_asconf.c in Sources */,
    1052910540                                5C6024691E494DB80088F0B2 /* user_recv_thread.c in Sources */,
     10541                                414D71171E4AEAFB0023E526 /* sctp_indata.c in Sources */,
    1053010542                                5C6024951E4950A00088F0B2 /* sctputil.c in Sources */,
    1053110543                                5C6024931E4950A00088F0B2 /* sctp_usrreq.c in Sources */,
Note: See TracChangeset for help on using the changeset viewer.