diff --git a/Android/README.md b/Android/README.md index d1d00be..c090859 100644 --- a/Android/README.md +++ b/Android/README.md @@ -98,7 +98,7 @@ The SDK must be integrated into the sample project before it can opened and buil ... dependencies { ... - implementation 'io.agora.rtc:full-sdk:3.0.0' + implementation 'io.agora.rtc:full-sdk:3.0.1' } ``` diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 00e1750..ada1d73 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,8 +12,8 @@ pool: vmImage: 'macos-latest' variables: - iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_0_0_FULL.zip?_ga=2.79185814.368877217.1583320605-5559409.1503304822' - MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_0_0_FULL.zip?_ga=2.78400662.368877217.1583320605-5559409.1503304822' + iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_0_1_FULL.zip?_ga=2.39937186.1429354637.1591107319-5559409.1503304822' + MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_0_1_FULL.zip?_ga=2.49505318.1429354637.1591107319-5559409.1503304822' WindowsRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows(x86)_v3_0_0_FULL.zip' ConnectionName: sbd021 RepoName: sbd021 diff --git a/iOS&macOS/17-Multistream-macOS/17-Multistream.xcodeproj/project.pbxproj b/iOS&macOS/17-Multistream-macOS/17-Multistream.xcodeproj/project.pbxproj index ed856c6..e2562dc 100644 --- a/iOS&macOS/17-Multistream-macOS/17-Multistream.xcodeproj/project.pbxproj +++ b/iOS&macOS/17-Multistream-macOS/17-Multistream.xcodeproj/project.pbxproj @@ -17,16 +17,25 @@ 075589781D7967CB004B0DEA /* VideoSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 075589761D7967CB004B0DEA /* VideoSession.swift */; }; 075589A61D7D44C8004B0DEA /* ReplacementSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 075589A51D7D44C8004B0DEA /* ReplacementSegue.swift */; }; 384C9AF62181965E00921076 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 384C9AF52181965E00921076 /* README.md */; }; - A773BCA42408BDEF003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA13312181A12C0091F5CD /* Accelerate.framework */; }; - A773BCA52408BDF5003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA13332181A13F0091F5CD /* VideoToolbox.framework */; }; - A773BCA62408BDFD003ECBFD /* CoreWLAN.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA13372181A1670091F5CD /* CoreWLAN.framework */; }; - A773BCA72408BE03003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 38DA13352181A1560091F5CD /* libc++.tbd */; }; - A773BCA82408BE0B003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D29C401E9E1ABD00C3583C /* libresolv.tbd */; }; - A773BCA92408BE16003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F282E7A1FF4F8E100D8F573 /* SystemConfiguration.framework */; }; + A7584B5C24869B9A0088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE023B1E24400335021 /* AgoraRtcKit.framework */; }; + A7584B5D24869B9A0088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE023B1E24400335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A79A7DDF23B1E17500335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DDE23B1E17500335021 /* KeyCenter.swift */; }; - A79A7DE223B1E25100335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE023B1E24400335021 /* AgoraRtcKit.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + A7584B5E24869B9A0088FACB /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A7584B5D24869B9A0088FACB /* AgoraRtcKit.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 071CE22D1D79362D00B82401 /* 17-Multistream.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "17-Multistream.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 071CE2301D79362D00B82401 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -58,13 +67,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A773BCA72408BE03003ECBFD /* libc++.tbd in Frameworks */, - A773BCA52408BDF5003ECBFD /* VideoToolbox.framework in Frameworks */, - A773BCA42408BDEF003ECBFD /* Accelerate.framework in Frameworks */, - A773BCA82408BE0B003ECBFD /* libresolv.tbd in Frameworks */, - A79A7DE223B1E25100335021 /* AgoraRtcKit.framework in Frameworks */, - A773BCA62408BDFD003ECBFD /* CoreWLAN.framework in Frameworks */, - A773BCA92408BE16003ECBFD /* SystemConfiguration.framework in Frameworks */, + A7584B5C24869B9A0088FACB /* AgoraRtcKit.framework in Frameworks */, 0565F321D90292467D84D0CF /* Pods_17_Multistream.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -153,6 +156,7 @@ 071CE22A1D79362D00B82401 /* Frameworks */, 071CE22B1D79362D00B82401 /* Resources */, 4FE84A8C36E21A90D51BA956 /* [CP] Embed Pods Frameworks */, + A7584B5E24869B9A0088FACB /* Embed Frameworks */, ); buildRules = ( ); diff --git a/iOS&macOS/17-Multistream/17-Multistream.xcodeproj/project.pbxproj b/iOS&macOS/17-Multistream/17-Multistream.xcodeproj/project.pbxproj index 445a9dd..b5bd97f 100644 --- a/iOS&macOS/17-Multistream/17-Multistream.xcodeproj/project.pbxproj +++ b/iOS&macOS/17-Multistream/17-Multistream.xcodeproj/project.pbxproj @@ -16,22 +16,26 @@ 0F240F821F7FA72C001B0AC6 /* VideoSessionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F240F811F7FA72C001B0AC6 /* VideoSessionView.swift */; }; 0F7ED6B61F7FA7A000B5329E /* VideoSessionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0F7ED6B51F7FA7A000B5329E /* VideoSessionView.xib */; }; 384C9A942179792100921076 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 384C9A932179792100921076 /* README.md */; }; - A773BC952408BCD2003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F80CD3A217867D900131A5E /* Accelerate.framework */; }; - A773BC972408BCDA003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BC962408BCDA003ECBFD /* AudioToolbox.framework */; }; - A773BC982408BCE1003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 384C9A9B21797A6500921076 /* VideoToolbox.framework */; }; - A773BC9A2408BCEA003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BC992408BCEA003ECBFD /* AVFoundation.framework */; }; - A773BC9B2408BCF7003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3802EF29225CC2240065A2E1 /* CoreML.framework */; }; - A773BC9E2408BCF7003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BC9C2408BCF7003ECBFD /* CoreMedia.framework */; }; - A773BC9F2408BCF7003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BC9D2408BCF7003ECBFD /* CoreMotion.framework */; }; - A773BCA02408BCFD003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 384C9A9D21797A7800921076 /* libc++.tbd */; }; - A773BCA12408BD05003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0745273C1E9E050C0054D2D4 /* libresolv.tbd */; }; - A773BCA22408BD0C003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 384C9A9921797A5D00921076 /* SystemConfiguration.framework */; }; - A773BCA32408BD7E003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 384C9A9721797A5700921076 /* CoreTelephony.framework */; }; + A7584B5624869B4E0088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF723B1E64400335021 /* AgoraRtcKit.framework */; }; + A7584B5724869B4E0088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF723B1E64400335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A79A7DD323B1E08600335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DD223B1E08600335021 /* KeyCenter.swift */; }; - A79A7DF923B1E65200335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF723B1E64400335021 /* AgoraRtcKit.framework */; }; D505C60A26A6C7379BF2AFA2 /* Pods_17_Multistream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8143D2CDDB7B483556178C5A /* Pods_17_Multistream.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + A7584B5824869B4E0088FACB /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A7584B5724869B4E0088FACB /* AgoraRtcKit.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 0745273C1E9E050C0054D2D4 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; 078012E91D1E57730093DE24 /* 17-Multistream.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "17-Multistream.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -69,19 +73,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A773BC9E2408BCF7003ECBFD /* CoreMedia.framework in Frameworks */, - A773BC9F2408BCF7003ECBFD /* CoreMotion.framework in Frameworks */, - A773BC952408BCD2003ECBFD /* Accelerate.framework in Frameworks */, - A773BCA12408BD05003ECBFD /* libresolv.tbd in Frameworks */, - A773BC9B2408BCF7003ECBFD /* CoreML.framework in Frameworks */, - A79A7DF923B1E65200335021 /* AgoraRtcKit.framework in Frameworks */, - A773BC9A2408BCEA003ECBFD /* AVFoundation.framework in Frameworks */, - A773BCA02408BCFD003ECBFD /* libc++.tbd in Frameworks */, - A773BCA32408BD7E003ECBFD /* CoreTelephony.framework in Frameworks */, - A773BC982408BCE1003ECBFD /* VideoToolbox.framework in Frameworks */, + A7584B5624869B4E0088FACB /* AgoraRtcKit.framework in Frameworks */, D505C60A26A6C7379BF2AFA2 /* Pods_17_Multistream.framework in Frameworks */, - A773BCA22408BD0C003ECBFD /* SystemConfiguration.framework in Frameworks */, - A773BC972408BCDA003ECBFD /* AudioToolbox.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -175,6 +168,7 @@ 078012E61D1E57730093DE24 /* Frameworks */, 078012E71D1E57730093DE24 /* Resources */, 86126748B5EC1C3CCE405185 /* [CP] Embed Pods Frameworks */, + A7584B5824869B4E0088FACB /* Embed Frameworks */, ); buildRules = ( ); diff --git a/iOS&macOS/Agora-Custom-Media-Device/Agora-Custom-Media-Device.xcodeproj/project.pbxproj b/iOS&macOS/Agora-Custom-Media-Device/Agora-Custom-Media-Device.xcodeproj/project.pbxproj index a9559f1..146cd52 100644 --- a/iOS&macOS/Agora-Custom-Media-Device/Agora-Custom-Media-Device.xcodeproj/project.pbxproj +++ b/iOS&macOS/Agora-Custom-Media-Device/Agora-Custom-Media-Device.xcodeproj/project.pbxproj @@ -18,22 +18,26 @@ 07D8BA111FE91A1600E8B4E2 /* AgoraMetalShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 07D8BA0F1FE91A1600E8B4E2 /* AgoraMetalShader.metal */; }; 07D8BA121FE91A1600E8B4E2 /* AgoraRenderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D8BA101FE91A1600E8B4E2 /* AgoraRenderView.swift */; }; 07D8BA141FE91A2500E8B4E2 /* AgoraCamera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D8BA131FE91A2500E8B4E2 /* AgoraCamera.swift */; }; - A773BCAA2408BEC0003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7047EFCB2194193B00FAA24C /* Accelerate.framework */; }; - A773BCAB2408BED0003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8B9FF1FE90C1E00E8B4E2 /* AudioToolbox.framework */; }; - A773BCAC2408BED8003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8B9FD1FE90C1900E8B4E2 /* VideoToolbox.framework */; }; - A773BCAE2408BEDD003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCAD2408BEDD003ECBFD /* AVFoundation.framework */; }; - A773BCAF2408BEE7003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA051FE90C2F00E8B4E2 /* SystemConfiguration.framework */; }; - A773BCB02408BEF2003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA031FE90C2B00E8B4E2 /* CoreMedia.framework */; }; - A773BCB12408BEF2003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3802EF25225CC1590065A2E1 /* CoreML.framework */; }; - A773BCB32408BEF3003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCB22408BEF3003ECBFD /* CoreMotion.framework */; }; - A773BCB42408BEF8003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA011FE90C2300E8B4E2 /* libc++.tbd */; }; - A773BCB52408BEFF003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA091FE90C3C00E8B4E2 /* libresolv.tbd */; }; - A773BCB62408BF59003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07D8BA071FE90C3700E8B4E2 /* CoreTelephony.framework */; }; + A7584B5924869B900088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF523B1E62A00335021 /* AgoraRtcKit.framework */; }; + A7584B5A24869B900088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF523B1E62A00335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A79A7DAC23B0AAB700335021 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A79A7DAB23B0AAB700335021 /* README.md */; }; A79A7DD523B1E0AA00335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DD423B1E0A900335021 /* KeyCenter.swift */; }; - A79A7DFB23B1E66000335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DF523B1E62A00335021 /* AgoraRtcKit.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + A7584B5B24869B900088FACB /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A7584B5A24869B900088FACB /* AgoraRtcKit.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 07D8B9CF1FE8EF9800E8B4E2 /* Agora-Custom-Media-Device.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Agora-Custom-Media-Device.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 07D8B9D21FE8EF9800E8B4E2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -69,18 +73,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A773BCAC2408BED8003ECBFD /* VideoToolbox.framework in Frameworks */, - A773BCB32408BEF3003ECBFD /* CoreMotion.framework in Frameworks */, - A79A7DFB23B1E66000335021 /* AgoraRtcKit.framework in Frameworks */, - A773BCB52408BEFF003ECBFD /* libresolv.tbd in Frameworks */, - A773BCB62408BF59003ECBFD /* CoreTelephony.framework in Frameworks */, - A773BCAE2408BEDD003ECBFD /* AVFoundation.framework in Frameworks */, - A773BCAA2408BEC0003ECBFD /* Accelerate.framework in Frameworks */, - A773BCAF2408BEE7003ECBFD /* SystemConfiguration.framework in Frameworks */, - A773BCB42408BEF8003ECBFD /* libc++.tbd in Frameworks */, - A773BCAB2408BED0003ECBFD /* AudioToolbox.framework in Frameworks */, - A773BCB12408BEF2003ECBFD /* CoreML.framework in Frameworks */, - A773BCB02408BEF2003ECBFD /* CoreMedia.framework in Frameworks */, + A7584B5924869B900088FACB /* AgoraRtcKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -170,6 +163,7 @@ 07D8B9CB1FE8EF9800E8B4E2 /* Sources */, 07D8B9CC1FE8EF9800E8B4E2 /* Frameworks */, 07D8B9CD1FE8EF9800E8B4E2 /* Resources */, + A7584B5B24869B900088FACB /* Embed Frameworks */, ); buildRules = ( ); diff --git a/iOS&macOS/Agora-Plugin-Raw-Data-API-Objective-C/Agora-Plugin-Raw-Data-API-iOS-Objective-C.xcodeproj/project.pbxproj b/iOS&macOS/Agora-Plugin-Raw-Data-API-Objective-C/Agora-Plugin-Raw-Data-API-iOS-Objective-C.xcodeproj/project.pbxproj index acddfc7..de5a88d 100755 --- a/iOS&macOS/Agora-Plugin-Raw-Data-API-Objective-C/Agora-Plugin-Raw-Data-API-iOS-Objective-C.xcodeproj/project.pbxproj +++ b/iOS&macOS/Agora-Plugin-Raw-Data-API-Objective-C/Agora-Plugin-Raw-Data-API-iOS-Objective-C.xcodeproj/project.pbxproj @@ -14,23 +14,27 @@ 1A8E8D481D396CAA002FA67C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1A8E8D471D396CAA002FA67C /* Assets.xcassets */; }; 1A8E8D4B1D396CAA002FA67C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1A8E8D491D396CAA002FA67C /* LaunchScreen.storyboard */; }; A70E3D6A23A08F7D00B7F68C /* AgoraMediaRawData.m in Sources */ = {isa = PBXBuildFile; fileRef = A70E3D6923A08F7D00B7F68C /* AgoraMediaRawData.m */; }; - A773BCB72408BFC3003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7237F89212A5E6000F2F397 /* Accelerate.framework */; }; - A773BCB82408BFCC003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8E8D721D396DB6002FA67C /* AudioToolbox.framework */; }; - A773BCB92408BFD2003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8E8D741D396DBB002FA67C /* VideoToolbox.framework */; }; - A773BCBA2408BFD6003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8E8D781D396DC6002FA67C /* AVFoundation.framework */; }; - A773BCBB2408BFE0003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8E8D761D396DC1002FA67C /* CoreMedia.framework */; }; - A773BCBC2408BFE0003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3802EF21225CC08F0065A2E1 /* CoreML.framework */; }; - A773BCBD2408BFE0003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8E8D7C1D396DCF002FA67C /* CoreMotion.framework */; }; - A773BCBE2408BFEA003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8E8D7E1D396DD3002FA67C /* SystemConfiguration.framework */; }; - A773BCC02408BFF9003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCBF2408BFF3003ECBFD /* libc++.tbd */; }; - A773BCC12408C002003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 077537C11ED5442900EF0878 /* libresolv.tbd */; }; - A773BCC22408C008003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8E8D7A1D396DCA002FA67C /* CoreTelephony.framework */; }; + A7584B5F24869BAF0088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DED23B1E5E100335021 /* AgoraRtcKit.framework */; }; + A7584B6024869BAF0088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DED23B1E5E100335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A79A7DB723B0BF5B00335021 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A79A7DB623B0BF5B00335021 /* README.md */; }; A79A7DD823B1E0DD00335021 /* KeyCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DD723B1E0DD00335021 /* KeyCenter.m */; }; - A79A7DEF23B1E5F100335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DED23B1E5E100335021 /* AgoraRtcKit.framework */; }; A7AC6ED020455BEB00F11E61 /* AgoraMediaDataPlugin.mm in Sources */ = {isa = PBXBuildFile; fileRef = A7AC6ECA20455BEB00F11E61 /* AgoraMediaDataPlugin.mm */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + A7584B6124869BAF0088FACB /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A7584B6024869BAF0088FACB /* AgoraRtcKit.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 077537C11ED5442900EF0878 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; 1A8E8D381D396CAA002FA67C /* Agora-Plugin-Raw-Data.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Agora-Plugin-Raw-Data.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -70,18 +74,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A773BCBB2408BFE0003ECBFD /* CoreMedia.framework in Frameworks */, - A773BCBE2408BFEA003ECBFD /* SystemConfiguration.framework in Frameworks */, - A773BCBC2408BFE0003ECBFD /* CoreML.framework in Frameworks */, - A773BCC12408C002003ECBFD /* libresolv.tbd in Frameworks */, - A773BCC22408C008003ECBFD /* CoreTelephony.framework in Frameworks */, - A773BCB92408BFD2003ECBFD /* VideoToolbox.framework in Frameworks */, - A79A7DEF23B1E5F100335021 /* AgoraRtcKit.framework in Frameworks */, - A773BCBA2408BFD6003ECBFD /* AVFoundation.framework in Frameworks */, - A773BCC02408BFF9003ECBFD /* libc++.tbd in Frameworks */, - A773BCB72408BFC3003ECBFD /* Accelerate.framework in Frameworks */, - A773BCB82408BFCC003ECBFD /* AudioToolbox.framework in Frameworks */, - A773BCBD2408BFE0003ECBFD /* CoreMotion.framework in Frameworks */, + A7584B5F24869BAF0088FACB /* AgoraRtcKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -176,6 +169,7 @@ 1A8E8D341D396CAA002FA67C /* Sources */, 1A8E8D351D396CAA002FA67C /* Frameworks */, 1A8E8D361D396CAA002FA67C /* Resources */, + A7584B6124869BAF0088FACB /* Embed Frameworks */, ); buildRules = ( ); diff --git a/iOS&macOS/Agora-Screen-Sharing/Agora-Screen-Sharing-iOS.xcodeproj/project.pbxproj b/iOS&macOS/Agora-Screen-Sharing/Agora-Screen-Sharing-iOS.xcodeproj/project.pbxproj index 8603e1f..a91dadd 100644 --- a/iOS&macOS/Agora-Screen-Sharing/Agora-Screen-Sharing-iOS.xcodeproj/project.pbxproj +++ b/iOS&macOS/Agora-Screen-Sharing/Agora-Screen-Sharing-iOS.xcodeproj/project.pbxproj @@ -27,35 +27,15 @@ 70DC1D55215F5019000CAD6B /* VideoViewLayouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70DC1D53215F5019000CAD6B /* VideoViewLayouter.swift */; }; A70E3D35239E4C7100B7F68C /* space.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = A70E3D33239E4C7000B7F68C /* space.mp3 */; }; A70E3D36239E4C7100B7F68C /* shoot.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = A70E3D34239E4C7100B7F68C /* shoot.mp3 */; }; - A718449323C2E54D008EA50E /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A718449223C2E54D008EA50E /* Accelerate.framework */; }; - A718449423C2E555008EA50E /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A718449223C2E54D008EA50E /* Accelerate.framework */; }; A718449523C2EA2A008EA50E /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE823B1E58C00335021 /* AgoraRtcKit.framework */; }; A718449723C2EC88008EA50E /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A718449623C2EC88008EA50E /* README.md */; }; A725D6E8241F26FB0040C835 /* AgoraAudioProcessing.mm in Sources */ = {isa = PBXBuildFile; fileRef = A725D6E7241F26FB0040C835 /* AgoraAudioProcessing.mm */; }; - A773BCC32408C080003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A718449223C2E54D008EA50E /* Accelerate.framework */; }; - A773BCC52408C086003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCC42408C086003ECBFD /* AVFoundation.framework */; }; - A773BCC72408C08B003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCC62408C08B003ECBFD /* AudioToolbox.framework */; }; - A773BCC92408C092003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCC82408C091003ECBFD /* VideoToolbox.framework */; }; - A773BCCD2408C09D003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCCA2408C09D003ECBFD /* CoreMedia.framework */; }; - A773BCCE2408C09D003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCCB2408C09D003ECBFD /* CoreML.framework */; }; - A773BCCF2408C09D003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCCC2408C09D003ECBFD /* CoreMotion.framework */; }; - A773BCD12408C0A4003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCD02408C0A3003ECBFD /* SystemConfiguration.framework */; }; - A773BCD32408C0B2003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCD22408C0AC003ECBFD /* libc++.tbd */; }; - A773BCD52408C0BF003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCD42408C0B9003ECBFD /* libresolv.tbd */; }; - A773BCD72408C0CC003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCD62408C0CC003ECBFD /* CoreTelephony.framework */; }; - A773BCD82408C120003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCC62408C08B003ECBFD /* AudioToolbox.framework */; }; - A773BCD92408C128003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCC82408C091003ECBFD /* VideoToolbox.framework */; }; - A773BCDA2408C12D003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCC42408C086003ECBFD /* AVFoundation.framework */; }; - A773BCDB2408C137003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCCA2408C09D003ECBFD /* CoreMedia.framework */; }; - A773BCDC2408C137003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCCB2408C09D003ECBFD /* CoreML.framework */; }; - A773BCDD2408C137003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCCC2408C09D003ECBFD /* CoreMotion.framework */; }; - A773BCDE2408C13C003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCD62408C0CC003ECBFD /* CoreTelephony.framework */; }; - A773BCDF2408C143003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCD22408C0AC003ECBFD /* libc++.tbd */; }; - A773BCE02408C14A003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCD42408C0B9003ECBFD /* libresolv.tbd */; }; - A773BCE12408C151003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCD02408C0A3003ECBFD /* SystemConfiguration.framework */; }; + A7584B6224869BCE0088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE823B1E58C00335021 /* AgoraRtcKit.framework */; }; + A7584B6324869BCE0088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE823B1E58C00335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + A7584B7D2486A6F60088FACB /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A718449223C2E54D008EA50E /* Accelerate.framework */; }; + A7584B7E2486A6FF0088FACB /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A718449223C2E54D008EA50E /* Accelerate.framework */; }; A79A7DDA23B1E0F700335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DD923B1E0F700335021 /* KeyCenter.swift */; }; A79A7DDB23B1E10200335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DD923B1E0F700335021 /* KeyCenter.swift */; }; - A79A7DF123B1E60500335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE823B1E58C00335021 /* AgoraRtcKit.framework */; }; A7FE1CE62397693700DF14A9 /* AgoraAudioTube.mm in Sources */ = {isa = PBXBuildFile; fileRef = A7FE1CE52397693700DF14A9 /* AgoraAudioTube.mm */; }; /* End PBXBuildFile section */ @@ -89,6 +69,17 @@ name = "Embed App Extensions"; runOnlyForDeploymentPostprocessing = 0; }; + A7584B6424869BCE0088FACB /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A7584B6324869BCE0088FACB /* AgoraRtcKit.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; A79A7DC823B0C1AB00335021 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -154,19 +145,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A773BCC52408C086003ECBFD /* AVFoundation.framework in Frameworks */, - A773BCD32408C0B2003ECBFD /* libc++.tbd in Frameworks */, - A773BCCF2408C09D003ECBFD /* CoreMotion.framework in Frameworks */, - A773BCC32408C080003ECBFD /* Accelerate.framework in Frameworks */, - A773BCC92408C092003ECBFD /* VideoToolbox.framework in Frameworks */, - A773BCC72408C08B003ECBFD /* AudioToolbox.framework in Frameworks */, - A718449323C2E54D008EA50E /* Accelerate.framework in Frameworks */, - A773BCD12408C0A4003ECBFD /* SystemConfiguration.framework in Frameworks */, - A773BCD72408C0CC003ECBFD /* CoreTelephony.framework in Frameworks */, - A79A7DF123B1E60500335021 /* AgoraRtcKit.framework in Frameworks */, - A773BCCE2408C09D003ECBFD /* CoreML.framework in Frameworks */, - A773BCCD2408C09D003ECBFD /* CoreMedia.framework in Frameworks */, - A773BCD52408C0BF003ECBFD /* libresolv.tbd in Frameworks */, + A7584B6224869BCE0088FACB /* AgoraRtcKit.framework in Frameworks */, + A7584B7E2486A6FF0088FACB /* Accelerate.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -174,19 +154,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A7584B7D2486A6F60088FACB /* Accelerate.framework in Frameworks */, A718449523C2EA2A008EA50E /* AgoraRtcKit.framework in Frameworks */, - A773BCDF2408C143003ECBFD /* libc++.tbd in Frameworks */, - A773BCDD2408C137003ECBFD /* CoreMotion.framework in Frameworks */, - A773BCDE2408C13C003ECBFD /* CoreTelephony.framework in Frameworks */, - A718449423C2E555008EA50E /* Accelerate.framework in Frameworks */, - A773BCE12408C151003ECBFD /* SystemConfiguration.framework in Frameworks */, - A773BCDA2408C12D003ECBFD /* AVFoundation.framework in Frameworks */, - A773BCD92408C128003ECBFD /* VideoToolbox.framework in Frameworks */, 38AEB69A2269FE5600C3ADD8 /* libios_resampler.a in Frameworks */, - A773BCD82408C120003ECBFD /* AudioToolbox.framework in Frameworks */, - A773BCDC2408C137003ECBFD /* CoreML.framework in Frameworks */, - A773BCDB2408C137003ECBFD /* CoreMedia.framework in Frameworks */, - A773BCE02408C14A003ECBFD /* libresolv.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -318,6 +288,7 @@ 07A67F2C1F306F6C0051AD0D /* Frameworks */, 07A67F2D1F306F6C0051AD0D /* Resources */, 07A67F611F3070A20051AD0D /* Embed App Extensions */, + A7584B6424869BCE0088FACB /* Embed Frameworks */, ); buildRules = ( ); diff --git a/iOS&macOS/Agora-Video-Source/Agora-Video-Source.xcodeproj/project.pbxproj b/iOS&macOS/Agora-Video-Source/Agora-Video-Source.xcodeproj/project.pbxproj index a9c1154..34d2582 100644 --- a/iOS&macOS/Agora-Video-Source/Agora-Video-Source.xcodeproj/project.pbxproj +++ b/iOS&macOS/Agora-Video-Source/Agora-Video-Source.xcodeproj/project.pbxproj @@ -14,21 +14,25 @@ 074526FD1E9CAD550054D2D4 /* VideoChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 074526FB1E9CAD550054D2D4 /* VideoChatViewController.swift */; }; 074527151E9CB2FE0054D2D4 /* MyVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 074527141E9CB2FE0054D2D4 /* MyVideoView.swift */; }; 074527171E9CB43D0054D2D4 /* MyVideoCapture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 074527161E9CB43D0054D2D4 /* MyVideoCapture.swift */; }; - A773BCE22408C3D1003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7021FD7C21E62CFD00938D67 /* Accelerate.framework */; }; - A773BCE32408C3D9003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0745270B1E9CAE9D0054D2D4 /* AudioToolbox.framework */; }; - A773BCE42408C3E0003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 074527071E9CAE920054D2D4 /* VideoToolbox.framework */; }; - A773BCE52408C3E5003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 074527051E9CAE8E0054D2D4 /* AVFoundation.framework */; }; - A773BCE62408C3FF003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0745270F1E9CAEA90054D2D4 /* CoreMedia.framework */; }; - A773BCE72408C3FF003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3802EF23225CC11C0065A2E1 /* CoreML.framework */; }; - A773BCE92408C3FF003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCE82408C3FF003ECBFD /* CoreMotion.framework */; }; - A773BCEA2408C418003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F2747CB1FB4593C005D3DBA /* SystemConfiguration.framework */; }; - A773BCEB2408C424003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 074527111E9CAEB10054D2D4 /* libc++.tbd */; }; - A773BCEC2408C42C003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 074527091E9CAE980054D2D4 /* libresolv.tbd */; }; - A773BCED2408C441003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0745270D1E9CAEA50054D2D4 /* CoreTelephony.framework */; }; + A7584B6524869C0C0088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7E0023B1F55F00335021 /* AgoraRtcKit.framework */; }; + A7584B6624869C0C0088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7E0023B1F55F00335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A79A7E0323B1F57200335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7E0223B1F57200335021 /* KeyCenter.swift */; }; - A79A7E0423B1F5AE00335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7E0023B1F55F00335021 /* AgoraRtcKit.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + A7584B6724869C0C0088FACB /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A7584B6624869C0C0088FACB /* AgoraRtcKit.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 074526E41E9CAB040054D2D4 /* Agora-Video-Source.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Agora-Video-Source.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 074526E71E9CAB040054D2D4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -60,18 +64,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A773BCE62408C3FF003ECBFD /* CoreMedia.framework in Frameworks */, - A773BCEA2408C418003ECBFD /* SystemConfiguration.framework in Frameworks */, - A773BCE72408C3FF003ECBFD /* CoreML.framework in Frameworks */, - A773BCEC2408C42C003ECBFD /* libresolv.tbd in Frameworks */, - A773BCED2408C441003ECBFD /* CoreTelephony.framework in Frameworks */, - A773BCE42408C3E0003ECBFD /* VideoToolbox.framework in Frameworks */, - A79A7E0423B1F5AE00335021 /* AgoraRtcKit.framework in Frameworks */, - A773BCE52408C3E5003ECBFD /* AVFoundation.framework in Frameworks */, - A773BCEB2408C424003ECBFD /* libc++.tbd in Frameworks */, - A773BCE22408C3D1003ECBFD /* Accelerate.framework in Frameworks */, - A773BCE32408C3D9003ECBFD /* AudioToolbox.framework in Frameworks */, - A773BCE92408C3FF003ECBFD /* CoreMotion.framework in Frameworks */, + A7584B6524869C0C0088FACB /* AgoraRtcKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -149,6 +142,7 @@ 074526E01E9CAB040054D2D4 /* Sources */, 074526E11E9CAB040054D2D4 /* Frameworks */, 074526E21E9CAB040054D2D4 /* Resources */, + A7584B6724869C0C0088FACB /* Embed Frameworks */, ); buildRules = ( ); diff --git a/iOS&macOS/Agora-Video-With-ARKit/Agora-Video-With-ARKit.xcodeproj/project.pbxproj b/iOS&macOS/Agora-Video-With-ARKit/Agora-Video-With-ARKit.xcodeproj/project.pbxproj index 34d7848..476f40c 100644 --- a/iOS&macOS/Agora-Video-With-ARKit/Agora-Video-With-ARKit.xcodeproj/project.pbxproj +++ b/iOS&macOS/Agora-Video-With-ARKit/Agora-Video-With-ARKit.xcodeproj/project.pbxproj @@ -16,21 +16,25 @@ 0763E690200376680010390F /* AgoraMetalShader.metal in Sources */ = {isa = PBXBuildFile; fileRef = 0763E68E200376670010390F /* AgoraMetalShader.metal */; }; 0763E691200376680010390F /* ARVideoRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0763E68F200376670010390F /* ARVideoRenderer.swift */; }; 07A51DA720074FBA00C2EE3D /* ARVideoSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07A51DA620074FBA00C2EE3D /* ARVideoSource.swift */; }; - A773BCEE2408C609003ECBFD /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 383D981A213FD7F500B46614 /* Accelerate.framework */; }; - A773BCF02408C612003ECBFD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCEF2408C612003ECBFD /* AudioToolbox.framework */; }; - A773BCF12408C617003ECBFD /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0763E695200376E00010390F /* VideoToolbox.framework */; }; - A773BCF32408C620003ECBFD /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCF22408C620003ECBFD /* AVFoundation.framework */; }; - A773BCF42408C629003ECBFD /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3802EF1D225CB6330065A2E1 /* CoreML.framework */; }; - A773BCF72408C629003ECBFD /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCF52408C629003ECBFD /* CoreMedia.framework */; }; - A773BCF82408C629003ECBFD /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCF62408C629003ECBFD /* CoreMotion.framework */; }; - A773BCFA2408C635003ECBFD /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A773BCF92408C62F003ECBFD /* libc++.tbd */; }; - A773BCFB2408C63B003ECBFD /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0763E69B200376F70010390F /* libresolv.tbd */; }; - A773BCFC2408C642003ECBFD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0763E699200376F00010390F /* SystemConfiguration.framework */; }; - A773BCFD2408C64E003ECBFD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0763E697200376E80010390F /* CoreTelephony.framework */; }; + A7584B6824869C540088FACB /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE623B1E57100335021 /* AgoraRtcKit.framework */; }; + A7584B6924869C540088FACB /* AgoraRtcKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE623B1E57100335021 /* AgoraRtcKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A79A7DDD23B1E12800335021 /* KeyCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79A7DDC23B1E12800335021 /* KeyCenter.swift */; }; - A79A7DFD23B1E68000335021 /* AgoraRtcKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A79A7DE623B1E57100335021 /* AgoraRtcKit.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + A7584B6A24869C540088FACB /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + A7584B6924869C540088FACB /* AgoraRtcKit.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 0763E66B200375430010390F /* Agora-Video-With-ARKit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Agora-Video-With-ARKit.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 0763E66E200375440010390F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -64,18 +68,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A773BCF12408C617003ECBFD /* VideoToolbox.framework in Frameworks */, - A79A7DFD23B1E68000335021 /* AgoraRtcKit.framework in Frameworks */, - A773BCF42408C629003ECBFD /* CoreML.framework in Frameworks */, - A773BCF32408C620003ECBFD /* AVFoundation.framework in Frameworks */, - A773BCFD2408C64E003ECBFD /* CoreTelephony.framework in Frameworks */, - A773BCEE2408C609003ECBFD /* Accelerate.framework in Frameworks */, - A773BCF02408C612003ECBFD /* AudioToolbox.framework in Frameworks */, - A773BCFC2408C642003ECBFD /* SystemConfiguration.framework in Frameworks */, - A773BCFA2408C635003ECBFD /* libc++.tbd in Frameworks */, - A773BCFB2408C63B003ECBFD /* libresolv.tbd in Frameworks */, - A773BCF72408C629003ECBFD /* CoreMedia.framework in Frameworks */, - A773BCF82408C629003ECBFD /* CoreMotion.framework in Frameworks */, + A7584B6824869C540088FACB /* AgoraRtcKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -155,6 +148,7 @@ 0763E667200375430010390F /* Sources */, 0763E668200375430010390F /* Frameworks */, 0763E669200375430010390F /* Resources */, + A7584B6A24869C540088FACB /* Embed Frameworks */, ); buildRules = ( ); diff --git a/iOS&macOS/scripts/sdkdownload.sh b/iOS&macOS/scripts/sdkdownload.sh index 6d2220b..c8a2227 100755 --- a/iOS&macOS/scripts/sdkdownload.sh +++ b/iOS&macOS/scripts/sdkdownload.sh @@ -1,6 +1,5 @@ TARGET_LIBS_ZIP="agora_sdk.zip" TARGET_INTERNAL_FOLDER="agora_sdk" -TARGET_INTERNAL_STATIC_FOLDER="agora_static_sdk" FILE_PATH=`pwd` @@ -19,50 +18,19 @@ unzip -q ${TARGET_LIBS_ZIP} -d ${TARGET_INTERNAL_FOLDER} cd ${TARGET_INTERNAL_FOLDER} -FIRST_UNZIP_FOLDER="" +FIRST_FOLDER="" for i in `ls` do - FIRST_UNZIP_FOLDER=$i + FIRST_FOLDER=$i echo $i done -cd ${FIRST_UNZIP_FOLDER} - -DYNAMIC_SDK_TAG="Dynamic" -STATIC_SDK="" - -for i in `ls` -do - if [[ $i =~ ${DYNAMIC_SDK_TAG} ]] - then - echo "Dynamic" $i - else - STATIC_SDK=$i - echo "Static" ${STATIC_SDK} -fi -done - -unzip -q ${STATIC_SDK} -d ${TARGET_INTERNAL_STATIC_FOLDER} - -cd ${TARGET_INTERNAL_STATIC_FOLDER} - -SECOND_UNZIP_FOLDER="" - -for i in `ls` -do - SECOND_UNZIP_FOLDER=$i - echo ${SECOND_UNZIP_FOLDER} -done - -echo `pwd` -echo SECOND_UNZIP_FOLDER ${SECOND_UNZIP_FOLDER} - #copy DESTINATION=${FILE_PATH}/../${COPY_TO} echo DESTINATION ${DESTINATION} -cp -af ${SECOND_UNZIP_FOLDER}/libs/* ${DESTINATION} +cp -af ${FIRST_FOLDER}/libs/* ${DESTINATION} echo pwd `pwd`