Changeset 211903 in webkit


Ignore:
Timestamp:
Feb 8, 2017, 2:50:18 PM (8 years ago)
Author:
achristensen@apple.com
Message:

Fix libwebrtc build.
​https://bugs.webkit.org/show_bug.cgi?id=168017

  • Configurations/libwebrtc.xcconfig:

Trying to compile audio_device_not_implemented_ios.mm on Mac doesn't work.

  • libwebrtc.xcodeproj/project.pbxproj:

Add some neon files. They are nicely protected by macros at the top, so their contents are only compiled if necessary.

Location:
trunk/Source/ThirdParty/libwebrtc
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r211902 r211903  
     12017-02-08  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix libwebrtc build.
     4        https://bugs.webkit.org/show_bug.cgi?id=168017
     5
     6        * Configurations/libwebrtc.xcconfig:
     7        Trying to compile audio_device_not_implemented_ios.mm on Mac doesn't work.
     8        * libwebrtc.xcodeproj/project.pbxproj:
     9        Add some neon files.  They are nicely protected by macros at the top, so their contents are only compiled if necessary.
     10
    1112017-02-08  Alex Christensen  <achristensen@webkit.org>
    212

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

    r211902 r211903  
    2222EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = *_sse.cc *_sse2.cc macutils.cc macwindowpicker.cc audio_device_mac.cc;
    2323EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = macutils.cc macwindowpicker.cc audio_device_mac.cc;
    24 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = audio_device_ios.mm voice_processing_audio_unit.mm RTCAudioSessionConfiguration.m RTCAudioSessionDelegateAdapter.mm RTCAudioSession.mm RTCAudioSession+Configuration.mm;
     24EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = audio_device_ios.mm voice_processing_audio_unit.mm audio_device_not_implemented_ios.mm RTCAudioSessionConfiguration.m RTCAudioSessionDelegateAdapter.mm RTCAudioSession.mm RTCAudioSession+Configuration.mm;

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

    r211902 r211903  
    24832483                5CFD53821E4BA4F500482908 /* voice_processing_audio_unit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD537B1E4BA4F500482908 /* voice_processing_audio_unit.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
    24842484                5CFD53841E4BBD8D00482908 /* audio_device_not_implemented_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53831E4BBD8D00482908 /* audio_device_not_implemented_ios.mm */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
     2485                5CFD538D1E4BD3A300482908 /* compare_neon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53851E4BD3A300482908 /* compare_neon.cc */; };
     2486                5CFD538E1E4BD3A300482908 /* compare_neon64.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53861E4BD3A300482908 /* compare_neon64.cc */; };
     2487                5CFD538F1E4BD3A300482908 /* rotate_neon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53871E4BD3A300482908 /* rotate_neon.cc */; };
     2488                5CFD53901E4BD3A300482908 /* rotate_neon64.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53881E4BD3A300482908 /* rotate_neon64.cc */; };
     2489                5CFD53911E4BD3A300482908 /* row_neon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD53891E4BD3A300482908 /* row_neon.cc */; };
     2490                5CFD53921E4BD3A300482908 /* row_neon64.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD538A1E4BD3A300482908 /* row_neon64.cc */; };
     2491                5CFD53931E4BD3A300482908 /* scale_neon.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD538B1E4BD3A300482908 /* scale_neon.cc */; };
     2492                5CFD53941E4BD3A300482908 /* scale_neon64.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CFD538C1E4BD3A300482908 /* scale_neon64.cc */; };
    24852493/* End PBXBuildFile section */
    24862494
    … …  
    51875195                5CFD537B1E4BA4F500482908 /* voice_processing_audio_unit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = voice_processing_audio_unit.mm; sourceTree = "<group>"; };
    51885196                5CFD53831E4BBD8D00482908 /* audio_device_not_implemented_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = audio_device_not_implemented_ios.mm; sourceTree = "<group>"; };
     5197                5CFD53851E4BD3A300482908 /* compare_neon.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = compare_neon.cc; path = source/compare_neon.cc; sourceTree = "<group>"; };
     5198                5CFD53861E4BD3A300482908 /* compare_neon64.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = compare_neon64.cc; path = source/compare_neon64.cc; sourceTree = "<group>"; };
     5199                5CFD53871E4BD3A300482908 /* rotate_neon.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rotate_neon.cc; path = source/rotate_neon.cc; sourceTree = "<group>"; };
     5200                5CFD53881E4BD3A300482908 /* rotate_neon64.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rotate_neon64.cc; path = source/rotate_neon64.cc; sourceTree = "<group>"; };
     5201                5CFD53891E4BD3A300482908 /* row_neon.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = row_neon.cc; path = source/row_neon.cc; sourceTree = "<group>"; };
     5202                5CFD538A1E4BD3A300482908 /* row_neon64.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = row_neon64.cc; path = source/row_neon64.cc; sourceTree = "<group>"; };
     5203                5CFD538B1E4BD3A300482908 /* scale_neon.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scale_neon.cc; path = source/scale_neon.cc; sourceTree = "<group>"; };
     5204                5CFD538C1E4BD3A300482908 /* scale_neon64.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scale_neon64.cc; path = source/scale_neon64.cc; sourceTree = "<group>"; };
    51895205                5D7C59C51208C68B001C873E /* libwebrtc.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libwebrtc.xcconfig; sourceTree = "<group>"; };
    51905206                5D7C59C61208C68B001C873E /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
    … …  
    66196635                                5C4B4D2F1E4323D4002651C8 /* compare_common.cc */,
    66206636                                5CDD84211E439BCB00621E92 /* compare_gcc.cc */,
     6637                                5CFD53851E4BD3A300482908 /* compare_neon.cc */,
     6638                                5CFD53861E4BD3A300482908 /* compare_neon64.cc */,
    66216639                                5C4B4D3B1E4323D4002651C8 /* convert.cc */,
    66226640                                5C4B4D351E4323D4002651C8 /* convert_argb.cc */,
    … …  
    66356653                                5C4B4D421E4323D4002651C8 /* rotate_common.cc */,
    66366654                                5CDD84221E439BCB00621E92 /* rotate_gcc.cc */,
     6655                                5CFD53871E4BD3A300482908 /* rotate_neon.cc */,
     6656                                5CFD53881E4BD3A300482908 /* rotate_neon64.cc */,
    66376657                                5C4B4D491E4323D4002651C8 /* row_any.cc */,
    66386658                                5C4B4D4A1E4323D4002651C8 /* row_common.cc */,
    66396659                                5CDD84231E439BCB00621E92 /* row_gcc.cc */,
     6660                                5CFD53891E4BD3A300482908 /* row_neon.cc */,
     6661                                5CFD538A1E4BD3A300482908 /* row_neon64.cc */,
    66406662                                5C4B4D591E4323D4002651C8 /* scale.cc */,
    66416663                                5C4B4D511E4323D4002651C8 /* scale_any.cc */,
    … …  
    66436665                                5C4B4D531E4323D4002651C8 /* scale_common.cc */,
    66446666                                5CDD84241E439BCB00621E92 /* scale_gcc.cc */,
     6667                                5CFD538B1E4BD3A300482908 /* scale_neon.cc */,
     6668                                5CFD538C1E4BD3A300482908 /* scale_neon64.cc */,
    66456669                                5C4B4D5A1E4323D4002651C8 /* video_common.cc */,
    66466670                        );
    … …  
    1129711321                                5C6CDD4B1E413598009754E3 /* common_types.cc in Sources */,
    1129811322                                5CDD8B861E43C2B500621E92 /* comp_corr.c in Sources */,
     11323                                5CFD538D1E4BD3A300482908 /* compare_neon.cc in Sources */,
     11324                                5CFD538E1E4BD3A300482908 /* compare_neon64.cc in Sources */,
    1129911325                                5CDD86441E43B8B500621E92 /* complex_bit_reverse.c in Sources */,
    1130011326                                5CDD86471E43B8B500621E92 /* complex_fft.c in Sources */,
    … …  
    1166911695                                5C4B4C7A1E431F9C002651C8 /* ring_buffer.c in Sources */,
    1167011696                                5CDD84BF1E43AF1300621E92 /* rms_level.cc in Sources */,
     11697                                5CFD538F1E4BD3A300482908 /* rotate_neon.cc in Sources */,
     11698                                5CFD53901E4BD3A300482908 /* rotate_neon64.cc in Sources */,
     11699                                5CFD53911E4BD3A300482908 /* row_neon.cc in Sources */,
     11700                                5CFD53921E4BD3A300482908 /* row_neon64.cc in Sources */,
    1167111701                                5CDD89671E43BF3A00621E92 /* rpsi.cc in Sources */,
    1167211702                                5CDD896A1E43BF3A00621E92 /* rrtr.cc in Sources */,
    … …  
    1176311793                                5C4B4CDE1E4320A9002651C8 /* rw_lock_posix.cc in Sources */,
    1176411794                                5CDD902F1E43CEDE00621E92 /* saturating_gain_estimator.cc in Sources */,
     11795                                5CFD53931E4BD3A300482908 /* scale_neon.cc in Sources */,
     11796                                5CFD53941E4BD3A300482908 /* scale_neon64.cc in Sources */,
    1176511797                                5C63F86D1E416288002CA531 /* scoped_autorelease_pool.mm in Sources */,
    1176611798                                5C4B484F1E42C1AF002651C8 /* sctpdataengine.cc in Sources */,
Note: See TracChangeset for help on using the changeset viewer.