diff --git a/Resources/icone-linphone-512.png b/Resources/icone-linphone-512.png deleted file mode 100644 index 511cb49f4..000000000 Binary files a/Resources/icone-linphone-512.png and /dev/null differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index d64d90a0f..befec876c 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -57,6 +57,7 @@ 227BCDC210D4004600FBFD76 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */; }; 227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */; }; 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; }; + 228B19AF130290C500F154D3 /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 228B19AE130290C500F154D3 /* iTunesArtwork */; }; 22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; }; 22968A8812F87C2000588287 /* UIDuration.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A8712F87C2000588287 /* UIDuration.m */; }; 22A10F3B11F8960300373793 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2C10765B400068D98F /* libortp.a */; }; @@ -274,6 +275,7 @@ 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallHistoryTableViewController.m; sourceTree = ""; }; 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CallHistoryTableViewController.xib; sourceTree = ""; }; 228697C311AC29B800E9E0CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; + 228B19AE130290C500F154D3 /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; name = iTunesArtwork; path = Resources/iTunesArtwork; sourceTree = ""; }; 22968A5D12F875C600588287 /* UISpeakerButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISpeakerButton.h; sourceTree = ""; }; 22968A5E12F875C600588287 /* UISpeakerButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UISpeakerButton.m; sourceTree = ""; }; 22968A8612F87C2000588287 /* UIDuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDuration.h; sourceTree = ""; }; @@ -645,6 +647,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 228B19AE130290C500F154D3 /* iTunesArtwork */, 2242E312125235120061DDCE /* oldphone-mono-30s.caf */, 225CB2F911ABB76400628906 /* linphone-banner.png */, 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */, @@ -776,6 +779,7 @@ 2242E313125235120061DDCE /* oldphone-mono-30s.caf in Resources */, 222A483412F7176F0075F07F /* IncallViewController.xib in Resources */, 2218A92612FBE1340088A667 /* FirstLoginViewController.xib in Resources */, + 228B19AF130290C500F154D3 /* iTunesArtwork in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -896,6 +900,71 @@ }; name = Release; }; + 228B19A61302902F00F154D3 /* Distribution adhoc */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: jehan monnier"; + GCC_C_LANGUAGE_STANDARD = c99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ""; + LINK_WITH_STANDARD_LIBRARIES = YES; + PREBINDING = NO; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "5B8A949D-21D7-4FB1-B7C0-6438B7297840"; + SDKROOT = iphoneos; + }; + name = "Distribution adhoc"; + }; + 228B19A71302902F00F154D3 /* Distribution adhoc */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_ENTITLEMENTS = untitled.plist; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = linphone_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; + HEADER_SEARCH_PATHS = ( + submodules/linphone/coreapi, + submodules/linphone/mediastreamer2/include, + submodules/linphone/mediastreamer2/include, + submodules/linphone/oRTP/include, + submodules/externals/gsm/, + submodules/externals/osip/include, + submodules/externals/exosip/include, + submodules/externals/speex/include, + ); + INFOPLIST_FILE = "linphone-Info.plist"; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", + ); + "LIBRARY_SEARCH_PATHS[sdk=iphoneos*][arch=*]" = ( + "\"$(SRCROOT)/submodules/build/$(CONFIGURATION)-iphoneos\"", + "$(inherited)", + ); + "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*][arch=*]" = ( + "\"$(SRCROOT)/submodules/build/$(CONFIGURATION)-iphonesimulator\"", + "$(inherited)", + ); + OTHER_LDFLAGS = ( + "-l", + linphone, + ); + PRODUCT_NAME = linphone; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + }; + name = "Distribution adhoc"; + }; 22F51EE7107FA53D00F98953 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1000,6 +1069,7 @@ buildConfigurations = ( 1D6058940D05DD3E006BFB54 /* Debug */, 22F51EE8107FA53D00F98953 /* Distribution */, + 228B19A71302902F00F154D3 /* Distribution adhoc */, 1D6058950D05DD3E006BFB54 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -1010,6 +1080,7 @@ buildConfigurations = ( C01FCF4F08A954540054247B /* Debug */, 22F51EE7107FA53D00F98953 /* Distribution */, + 228B19A61302902F00F154D3 /* Distribution adhoc */, C01FCF5008A954540054247B /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/submodules/linphone b/submodules/linphone index f89550038..8ee93c80c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f89550038a73df8d7ded83252401fea09afd65ba +Subproject commit 8ee93c80c924d1f7143fbea46fa17e5eb2430028