diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 52ba9c37e..5b7ff9953 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -647,8 +647,6 @@ 22405EE31600671D00B92522 /* logging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = logging.c; sourceTree = ""; }; 22405EE41600671D00B92522 /* rtpprofile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtpprofile.c; sourceTree = ""; }; 22405EE71600675C00B92522 /* genericplc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genericplc.c; sourceTree = ""; }; - 224AD571143208BB00510FF3 /* android-display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "android-display.c"; path = "../../../../../../workspace-android/linphone-android/submodules/linphone/mediastreamer2/src/android-display.c"; sourceTree = ""; }; - 224AD57314320EB400510FF3 /* scaler_arm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = scaler_arm.S; path = "../../../../../../workspace-android/linphone-android/submodules/linphone/mediastreamer2/src/scaler_arm.S"; sourceTree = ""; }; 22512698145F13CE0041FBF2 /* aqsnd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aqsnd.c; sourceTree = ""; }; 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ec-calibrator.c"; path = "linphone/coreapi/ec-calibrator.c"; sourceTree = SOURCE_ROOT; }; 2258C44013A9377B0087A596 /* swscale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swscale.h; sourceTree = ""; }; @@ -925,73 +923,51 @@ 222CA5DC11F6CF7600621220 /* src */ = { isa = PBXGroup; children = ( - 22405EE71600675C00B92522 /* genericplc.c */, - 22405EDF1600668800B92522 /* msvoip.c */, - 221DCB6A153584410025E54D /* yuv2rgb.fs */, - 221DCB6B153584410025E54D /* yuv2rgb.vs */, - 221DCB6715347EF80025E54D /* opengles_display.c */, - 2211DB9B1476539600DEE054 /* l16.c */, - 22512698145F13CE0041FBF2 /* aqsnd.c */, - F4D9F25E14583B580035B0D0 /* bitratedriver.c */, - F4D9F25F14583B580035B0D0 /* qosanalyzer.c */, - 22313679143DED490035C1F4 /* msandroidvideo.cpp */, - 229ECDEE143AEC2400D611B8 /* audioconference.c */, - 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */, - 224AD57314320EB400510FF3 /* scaler_arm.S */, - 224AD571143208BB00510FF3 /* android-display.c */, - 7014533713FA7AEA00A01D86 /* shaders.c */, - 7066FC0613E82A3600EFC6DC /* vp8.c */, - 70E542F613E14816002BA2C0 /* shaders.h */, - 229A614913DDFE3500090183 /* g722_decode.c */, - 229A614A13DDFE3500090183 /* g722_encode.c */, - 229A614B13DDFE3500090183 /* g722.h */, - 229A614C13DDFE3500090183 /* msg722.c */, - 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */, - 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */, - 221F58AD13ABA42800D603C9 /* scaler.c */, - 221F58AB13AB71A400D603C9 /* sizeconv.c */, - 221F58A513AB716300D603C9 /* tonedetector.c */, - 221F58A613AB716300D603C9 /* jpegwriter.c */, - 221F58A713AB716300D603C9 /* h264dec.c */, - 221F58A113AB6F8000D603C9 /* pixconv.c */, - 221F589B13AB4FC500D603C9 /* msvideo.c */, - 2258C44813A946890087A596 /* videostream.c */, - 2258C44913A946890087A596 /* videoenc.c */, - 2258C44A13A946890087A596 /* videodec.c */, - 2258C44013A9377B0087A596 /* swscale.h */, - 220ED1AA13A9062500AC21E0 /* nowebcam.h */, - 220ED1AB13A9062500AC21E0 /* nowebcam.c */, - 22D15AB5139F579D00C7713A /* qtcapture.m */, - 22D15AB3139F505400C7713A /* ioscapture.m */, - 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */, 222CA5DD11F6CF7600621220 /* .gitignore */, 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */, 222CA5DF11F6CF7600621220 /* alaw.c */, + 22512698145F13CE0041FBF2 /* aqsnd.c */, + 229ECDEE143AEC2400D611B8 /* audioconference.c */, 222CA5E311F6CF7600621220 /* audiomixer.c */, 222CA5E411F6CF7600621220 /* audiostream.c */, + 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */, + F4D9F25E14583B580035B0D0 /* bitratedriver.c */, 222CA5E511F6CF7600621220 /* chanadapt.c */, 222CA5E711F6CF7600621220 /* dsptools.c */, 222CA5E811F6CF7600621220 /* dtmfgen.c */, + 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */, 222CA5EB11F6CF7600621220 /* equalizer.c */, 222CA5EC11F6CF7600621220 /* eventqueue.c */, 222CA5ED11F6CF7600621220 /* extdisplay.c */, 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */, + 2203127413A249F70049A2ED /* filter-template.c */, 222CA5EF11F6CF7600621220 /* g711common.h */, + 229A614B13DDFE3500090183 /* g722.h */, + 229A614913DDFE3500090183 /* g722_decode.c */, + 229A614A13DDFE3500090183 /* g722_encode.c */, + 22405EE71600675C00B92522 /* genericplc.c */, 222CA5F011F6CF7600621220 /* gsm.c */, + 221F58A713AB716300D603C9 /* h264dec.c */, 222CA5F211F6CF7600621220 /* ice.c */, + 22D15AB3139F505400C7713A /* ioscapture.m */, + 2203127113A247B40049A2ED /* iosdisplay.m */, 222CA5F311F6CF7600621220 /* itc.c */, + 221F58A613AB716300D603C9 /* jpegwriter.c */, 222CA5F411F6CF7600621220 /* kiss_fft.c */, 222CA5F511F6CF7600621220 /* kiss_fft.h */, 222CA5F611F6CF7600621220 /* kiss_fftr.c */, 222CA5F711F6CF7600621220 /* kiss_fftr.h */, + 2211DB9B1476539600DEE054 /* l16.c */, 222CA5F911F6CF7600621220 /* Makefile.am */, 222CA5FA11F6CF7600621220 /* Makefile.in */, 222CA5FB11F6CF7600621220 /* mire.c */, + 22313679143DED490035C1F4 /* msandroidvideo.cpp */, 222CA5FD11F6CF7600621220 /* mscommon.c */, 222CA5FE11F6CF7600621220 /* msconf.c */, 222CA60011F6CF7600621220 /* msfileplayer.c */, 222CA60211F6CF7600621220 /* msfilerec.c */, 222CA60411F6CF7600621220 /* msfilter.c */, + 229A614C13DDFE3500090183 /* msg722.c */, 222CA60511F6CF7600621220 /* msiounit.m */, 222CA60611F6CF7600621220 /* msjoin.c */, 222CA60711F6CF7600621220 /* msqueue.c */, @@ -1000,18 +976,38 @@ 222CA60A11F6CF7600621220 /* mssndcard.c */, 222CA60B11F6CF7600621220 /* msspeex.c */, 222CA60C11F6CF7600621220 /* msticker.c */, + 221F589B13AB4FC500D603C9 /* msvideo.c */, + 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */, + 22405EDF1600668800B92522 /* msvoip.c */, 222CA61111F6CF7600621220 /* msvolume.c */, 222CA61311F6CF7600621220 /* mtu.c */, + 220ED1AB13A9062500AC21E0 /* nowebcam.c */, + 220ED1AA13A9062500AC21E0 /* nowebcam.h */, + 221DCB6715347EF80025E54D /* opengles_display.c */, + 221F58A113AB6F8000D603C9 /* pixconv.c */, + F4D9F25F14583B580035B0D0 /* qosanalyzer.c */, + 22D15AB5139F579D00C7713A /* qtcapture.m */, + 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */, 222CA61B11F6CF7600621220 /* rfc2429.h */, 222CA61C11F6CF7600621220 /* rfc3984.c */, + 221F58AD13ABA42800D603C9 /* scaler.c */, + 221F58E313AF44B300D603C9 /* scaler.h */, + 7014533713FA7AEA00A01D86 /* shaders.c */, + 70E542F613E14816002BA2C0 /* shaders.h */, + 221F58AB13AB71A400D603C9 /* sizeconv.c */, 222CA61F11F6CF7600621220 /* speexec.c */, + 2258C44013A9377B0087A596 /* swscale.h */, 222CA62111F6CF7600621220 /* tee.c */, + 221F58A513AB716300D603C9 /* tonedetector.c */, 222CA62311F6CF7600621220 /* ulaw.c */, 222CA62411F6CF7600621220 /* vfw-missing.h */, + 2258C44A13A946890087A596 /* videodec.c */, + 2258C44913A946890087A596 /* videoenc.c */, + 2258C44813A946890087A596 /* videostream.c */, 222CA62911F6CF7600621220 /* void.c */, - 2203127113A247B40049A2ED /* iosdisplay.m */, - 2203127413A249F70049A2ED /* filter-template.c */, - 221F58E313AF44B300D603C9 /* scaler.h */, + 7066FC0613E82A3600EFC6DC /* vp8.c */, + 221DCB6A153584410025E54D /* yuv2rgb.fs */, + 221DCB6B153584410025E54D /* yuv2rgb.vs */, ); path = src; sourceTree = ""; @@ -1802,10 +1798,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); COPY_PHASE_STRIP = NO; DSTROOT = /tmp/liblinphone.dst; GCC_DYNAMIC_NO_PIC = NO; @@ -1863,10 +1855,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); DSTROOT = /tmp/liblinphone.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2003,10 +1991,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); COPY_PHASE_STRIP = NO; DSTROOT = /tmp/liblinphone.dst; GCC_DYNAMIC_NO_PIC = NO; @@ -2035,6 +2019,7 @@ HAVE_LIBAVCODEC_AVCODEC_H, HAVE_LIBSWSCALE_SWSCALE_H, TARGET_OS_IPHONE, + MS2_FILTERS, ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; @@ -2065,10 +2050,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); DSTROOT = /tmp/liblinphone.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2094,6 +2075,7 @@ HAVE_LIBAVCODEC_AVCODEC_H, HAVE_LIBSWSCALE_SWSCALE_H, TARGET_OS_IPHONE, + MS2_FILTERS, ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; @@ -2124,10 +2106,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); DSTROOT = /tmp/liblinphone.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2153,6 +2131,7 @@ HAVE_LIBAVCODEC_AVCODEC_H, HAVE_LIBSWSCALE_SWSCALE_H, TARGET_OS_IPHONE, + MS2_FILTERS, ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; @@ -2183,10 +2162,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); COPY_PHASE_STRIP = NO; DSTROOT = /tmp/liblinphone.dst; GCC_DYNAMIC_NO_PIC = NO; @@ -2245,10 +2220,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); DSTROOT = /tmp/liblinphone.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2304,10 +2275,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); DSTROOT = /tmp/liblinphone.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2404,10 +2371,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = ( - armv6, - "$(ARCHS_STANDARD_32_BIT)", - ); DSTROOT = /tmp/liblinphone.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES;