diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index a4fd70a2c..97b715318 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -35,6 +35,9 @@ extern void libmsilbc_init(); #ifdef HAVE_AMR extern void libmsamr_init(); #endif +#if defined (HAVE_SILK) +extern void libmssilk_init(); +#endif @implementation LinphoneManager @synthesize callDelegate; @synthesize registrationDelegate; @@ -681,7 +684,9 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach } libmsilbc_init(); - +#if defined (HAVE_SILK) + libmssilk_init(); +#endif #ifdef HAVE_AMR libmsamr_init(); //load amr plugin if present from the liblinphone sdk #endif /* diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 73c66fb1b..57a14a547 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1048,7 +1048,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", + armv7, armv6, ); "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1058,7 +1058,10 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + HAVE_SILK, + ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, @@ -1119,7 +1122,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", + armv7, armv6, ); CODE_SIGN_ENTITLEMENTS = untitled.plist; @@ -1130,7 +1133,10 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + HAVE_SILK, + ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, @@ -1191,7 +1197,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", + armv7, armv6, ); CODE_SIGN_ENTITLEMENTS = untitled.plist; @@ -1202,7 +1208,10 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + HAVE_SILK, + ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, diff --git a/submodules/linphone b/submodules/linphone index 64a23f9b6..a85f334c6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 64a23f9b67cab8aa0f4cac22211722d1fa9e3716 +Subproject commit a85f334c663037f53f534907e1c357866f636cfe