From 5cec874fab384b9587945d2418a8abb7c40181ea Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 21 May 2018 09:22:13 +0200 Subject: [PATCH] Improve IOS Frameworks to be compatible with cocoapods --- Classes/ChatConversationTableView.h | 4 ++-- linphone.xcodeproj/project.pbxproj | 8 ++++---- submodules/cmake-builder | 2 +- submodules/externals/speex | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Classes/ChatConversationTableView.h b/Classes/ChatConversationTableView.h index 940e3465a..aae766894 100644 --- a/Classes/ChatConversationTableView.h +++ b/Classes/ChatConversationTableView.h @@ -20,8 +20,8 @@ #import #include "linphone/linphonecore.h" -#import "linphone/c-event-log.h" -#import "linphone/c-chat-room.h" +#import "linphone/api/c-event-log.h" +#import "linphone/api/c-chat-room.h" #import "UICheckBoxTableView.h" diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index cb6a67330..72aece97c 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; }; 22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AA8B0013D83F6300B30535 /* UICamSwitch.m */; }; 22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */; }; + 22C7693F20AD8DC20028D256 /* mediastreamer2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22C7693E20AD8DC10028D256 /* mediastreamer2.framework */; }; 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B68012A3E0BE001AE361 /* libresolv.dylib */; }; 22E0A822111C44E100B04932 /* AboutView.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* AboutView.m */; }; 22F2508E107141E100AC9B3F /* DialerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F2508C107141E100AC9B3F /* DialerView.m */; }; @@ -643,9 +644,7 @@ 8C3EAA061EB8CEE700B732B6 /* bctoolbox.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C5BCEC71EB3859200A9AAEF /* bctoolbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 8C3EAA071EB8CEE700B732B6 /* linphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C5BCEC81EB3859200A9AAEF /* linphone.framework */; }; 8C3EAA081EB8CEE700B732B6 /* linphone.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C5BCEC81EB3859200A9AAEF /* linphone.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 8C3EAA091EB8CEE700B732B6 /* mediastreamer_base.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C5BCEC91EB3859200A9AAEF /* mediastreamer_base.framework */; }; 8C3EAA0A1EB8CEE700B732B6 /* mediastreamer_base.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C5BCEC91EB3859200A9AAEF /* mediastreamer_base.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 8C3EAA0B1EB8CEE700B732B6 /* mediastreamer_voip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C5BCECA1EB3859200A9AAEF /* mediastreamer_voip.framework */; }; 8C3EAA0C1EB8CEE700B732B6 /* mediastreamer_voip.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C5BCECA1EB3859200A9AAEF /* mediastreamer_voip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 8C3EAA0D1EB8CEE700B732B6 /* mssilk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C5BCECB1EB3859200A9AAEF /* mssilk.framework */; }; 8C3EAA0E1EB8CEE700B732B6 /* mssilk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C5BCECB1EB3859200A9AAEF /* mssilk.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -963,6 +962,7 @@ 22B5F03410CE6B2F00777D97 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; 22C7555E1317E59C007BC101 /* UIBluetoothButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIBluetoothButton.h; sourceTree = ""; }; 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIBluetoothButton.m; sourceTree = ""; }; + 22C7693E20AD8DC10028D256 /* mediastreamer2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = mediastreamer2.framework; path = "liblinphone-sdk/apple-darwin/Frameworks/mediastreamer2.framework"; sourceTree = ""; }; 22D1B68012A3E0BE001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; }; 22E0A81C111C44E100B04932 /* AboutView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutView.m; sourceTree = ""; }; 22E0A81D111C44E100B04932 /* AboutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutView.h; sourceTree = ""; }; @@ -1973,10 +1973,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8C3EAA0B1EB8CEE700B732B6 /* mediastreamer_voip.framework in Frameworks */, + 22C7693F20AD8DC20028D256 /* mediastreamer2.framework in Frameworks */, 8C3EA9FD1EB8CEE700B732B6 /* msx264.framework in Frameworks */, 63CE58451C85EC1000304800 /* VideoToolbox.framework in Frameworks */, - 8C3EAA091EB8CEE700B732B6 /* mediastreamer_base.framework in Frameworks */, 15F728741B16FF9A00A1C901 /* libxml2.dylib in Frameworks */, F0A54B0C1AD56F4600C22733 /* libc++.dylib in Frameworks */, 8C3EAA0D1EB8CEE700B732B6 /* mssilk.framework in Frameworks */, @@ -2295,6 +2294,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 22C7693E20AD8DC10028D256 /* mediastreamer2.framework */, 8C1A1F7C1FA331D40064BE00 /* libsoci_sqlite3.a */, 8CD0B3C81FA2357B008FEB16 /* libsqlite3.a */, 8CD0B3BE1FA22CBA008FEB16 /* libsoci_core.a */, diff --git a/submodules/cmake-builder b/submodules/cmake-builder index e2fe49c93..0eb5bcece 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit e2fe49c934beb86505391bc39189e1d5cc8e2b8b +Subproject commit 0eb5bceceea744d766a1f53259181a7fccdd3d44 diff --git a/submodules/externals/speex b/submodules/externals/speex index db706eebc..a86ed3c99 160000 --- a/submodules/externals/speex +++ b/submodules/externals/speex @@ -1 +1 @@ -Subproject commit db706eebcfb0b848f67604eb83b7e257953e6506 +Subproject commit a86ed3c99794f20a5a525d71ca37d2b7788d6ba6 diff --git a/submodules/linphone b/submodules/linphone index c35f4f271..3087ae374 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c35f4f27194d400ba122d0b8796bdac232bd5a01 +Subproject commit 3087ae374c42e146f25da056ea0a772f84c7533a diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index ad4cdb240..4d51f737c 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit ad4cdb240e553654f87438fb4519754e90d1773d +Subproject commit 4d51f737c04e16b9b542f1e4a9699bf05069f92a