diff --git a/README b/README index 69b14a4c5..f0e58f4d9 100644 --- a/README +++ b/README @@ -7,6 +7,7 @@ Linphone for iPhone depends on liblinphone sdk. To build this sdk, you must inst -libtool -intltool -wget +-pkgconfig Link macport libtoolize to glibtoolize (sudo ln -s /opt/local/bin/glibtoolize /opt/local/bin/libtoolize) diff --git a/liblinphone-tutorials/hello-world/README b/liblinphone-tutorials/hello-world/README new file mode 100644 index 000000000..c0b2fe90c --- /dev/null +++ b/liblinphone-tutorials/hello-world/README @@ -0,0 +1,5 @@ +This xcode project just compile linphone tutorials from the sdk. +This project assumes liblinphone-sdk to be located in the same directory then liblinphone-tutorials. + +For each xcode tutotial target, do not forget to fill arguments to be passed on launch. + diff --git a/liblinphone-tutorials/hello-world/REAME b/liblinphone-tutorials/hello-world/REAME deleted file mode 100644 index 464be2646..000000000 --- a/liblinphone-tutorials/hello-world/REAME +++ /dev/null @@ -1,2 +0,0 @@ -This xcode project just compile helloworld.c linphone tutorial. -This project assumes liblinphone-sdk to be located in linphone-iphone directory. diff --git a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj index 5b4c4b6f5..d6434c78c 100755 --- a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj +++ b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj @@ -23,7 +23,61 @@ 2220D5D81278461C008F2C2E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; 2220D5DA1278461C008F2C2E /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D91278461C008F2C2E /* CoreAudio.framework */; }; 2220D5EA12784672008F2C2E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5E912784672008F2C2E /* AudioToolbox.framework */; }; + 2294996712A53FEE00D6CF48 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 2294995712A53FD800D6CF48 /* registration.c */; }; + 2294996912A53FEE00D6CF48 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; + 2294996A12A53FEE00D6CF48 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; + 2294996B12A53FEE00D6CF48 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; + 2294996C12A53FEE00D6CF48 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5BD127845EE008F2C2E /* libeXosip2.a */; }; + 2294996D12A53FEE00D6CF48 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5BF127845EE008F2C2E /* libgsm.a */; }; + 2294996E12A53FEE00D6CF48 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C1127845EE008F2C2E /* libilbc.a */; }; + 2294996F12A53FEE00D6CF48 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C3127845EE008F2C2E /* liblinphone.a */; }; + 2294997012A53FEE00D6CF48 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C5127845EE008F2C2E /* libmediastreamer.a */; }; + 2294997112A53FEE00D6CF48 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C7127845EE008F2C2E /* libortp.a */; }; + 2294997212A53FEE00D6CF48 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C9127845EE008F2C2E /* libosip2.a */; }; + 2294997312A53FEE00D6CF48 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CB127845EE008F2C2E /* libosipparser2.a */; }; + 2294997412A53FEE00D6CF48 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CD127845EE008F2C2E /* libspeex.a */; }; + 2294997512A53FEE00D6CF48 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CF127845EE008F2C2E /* libspeexdsp.a */; }; + 2294997612A53FEE00D6CF48 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; + 2294997712A53FEE00D6CF48 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D91278461C008F2C2E /* CoreAudio.framework */; }; + 2294997812A53FEE00D6CF48 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5E912784672008F2C2E /* AudioToolbox.framework */; }; + 2294997912A53FEE00D6CF48 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; + 229499A612A5417D00D6CF48 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; + 229499A712A5417D00D6CF48 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; + 229499A812A5417D00D6CF48 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; + 229499A912A5417D00D6CF48 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5BD127845EE008F2C2E /* libeXosip2.a */; }; + 229499AA12A5417D00D6CF48 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5BF127845EE008F2C2E /* libgsm.a */; }; + 229499AB12A5417D00D6CF48 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C1127845EE008F2C2E /* libilbc.a */; }; + 229499AC12A5417D00D6CF48 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C3127845EE008F2C2E /* liblinphone.a */; }; + 229499AD12A5417D00D6CF48 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C5127845EE008F2C2E /* libmediastreamer.a */; }; + 229499AE12A5417D00D6CF48 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C7127845EE008F2C2E /* libortp.a */; }; + 229499AF12A5417D00D6CF48 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C9127845EE008F2C2E /* libosip2.a */; }; + 229499B012A5417D00D6CF48 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CB127845EE008F2C2E /* libosipparser2.a */; }; + 229499B112A5417D00D6CF48 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CD127845EE008F2C2E /* libspeex.a */; }; + 229499B212A5417D00D6CF48 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CF127845EE008F2C2E /* libspeexdsp.a */; }; + 229499B312A5417D00D6CF48 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; + 229499B412A5417D00D6CF48 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D91278461C008F2C2E /* CoreAudio.framework */; }; + 229499B512A5417D00D6CF48 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5E912784672008F2C2E /* AudioToolbox.framework */; }; + 229499B612A5417D00D6CF48 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; + 229499BD12A5419500D6CF48 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 2294995612A53FD800D6CF48 /* chatroom.c */; }; + 229499EB12A5433F00D6CF48 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; + 229499EC12A5433F00D6CF48 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; + 229499ED12A5433F00D6CF48 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; + 229499EE12A5433F00D6CF48 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5BD127845EE008F2C2E /* libeXosip2.a */; }; + 229499EF12A5433F00D6CF48 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5BF127845EE008F2C2E /* libgsm.a */; }; + 229499F012A5433F00D6CF48 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C1127845EE008F2C2E /* libilbc.a */; }; + 229499F112A5433F00D6CF48 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C3127845EE008F2C2E /* liblinphone.a */; }; + 229499F212A5433F00D6CF48 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C5127845EE008F2C2E /* libmediastreamer.a */; }; + 229499F312A5433F00D6CF48 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C7127845EE008F2C2E /* libortp.a */; }; + 229499F412A5433F00D6CF48 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5C9127845EE008F2C2E /* libosip2.a */; }; + 229499F512A5433F00D6CF48 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CB127845EE008F2C2E /* libosipparser2.a */; }; + 229499F612A5433F00D6CF48 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CD127845EE008F2C2E /* libspeex.a */; }; + 229499F712A5433F00D6CF48 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5CF127845EE008F2C2E /* libspeexdsp.a */; }; + 229499F812A5433F00D6CF48 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; + 229499F912A5433F00D6CF48 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D91278461C008F2C2E /* CoreAudio.framework */; }; + 229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5E912784672008F2C2E /* AudioToolbox.framework */; }; + 229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; 22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; + 22DF2B1612A65892007C6B74 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 2294995512A53FD800D6CF48 /* buddy_status.c */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; /* End PBXBuildFile section */ @@ -31,7 +85,7 @@ 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 2220D596127844C9008F2C2E /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = ../../submodules/linphone/coreapi/help/helloworld.c; sourceTree = SOURCE_ROOT; }; + 2220D596127844C9008F2C2E /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = "../../liblinphone-sdk/apple-darwin/share/tutorials/linphone/helloworld.c"; sourceTree = SOURCE_ROOT; }; 2220D5BD127845EE008F2C2E /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "/Users/jehanmonnier/workspaces/workspace-iphone-port/linphone-iphone/liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; 2220D5BF127845EE008F2C2E /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "/Users/jehanmonnier/workspaces/workspace-iphone-port/linphone-iphone/liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; 2220D5C1127845EE008F2C2E /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "/Users/jehanmonnier/workspaces/workspace-iphone-port/linphone-iphone/liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; @@ -46,10 +100,16 @@ 2220D5D71278461C008F2C2E /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 2220D5D91278461C008F2C2E /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 2220D5E912784672008F2C2E /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + 2294995512A53FD800D6CF48 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = "../../liblinphone-sdk/apple-darwin/share/tutorials/linphone/buddy_status.c"; sourceTree = SOURCE_ROOT; }; + 2294995612A53FD800D6CF48 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = "../../liblinphone-sdk/apple-darwin/share/tutorials/linphone/chatroom.c"; sourceTree = SOURCE_ROOT; }; + 2294995712A53FD800D6CF48 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = "../../liblinphone-sdk/apple-darwin/share/tutorials/linphone/registration.c"; sourceTree = SOURCE_ROOT; }; + 2294997D12A53FEE00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 229499BA12A5417D00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 229499FF12A5433F00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 22D1B6A012A3E159001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hello_world_Prefix.pch; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* hello_world-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "hello_world-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; + 8D1107310486CEB800E47090 /* helloworld-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "helloworld-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -77,6 +137,78 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 2294996812A53FEE00D6CF48 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 2294996912A53FEE00D6CF48 /* Foundation.framework in Frameworks */, + 2294996A12A53FEE00D6CF48 /* UIKit.framework in Frameworks */, + 2294996B12A53FEE00D6CF48 /* CoreGraphics.framework in Frameworks */, + 2294996C12A53FEE00D6CF48 /* libeXosip2.a in Frameworks */, + 2294996D12A53FEE00D6CF48 /* libgsm.a in Frameworks */, + 2294996E12A53FEE00D6CF48 /* libilbc.a in Frameworks */, + 2294996F12A53FEE00D6CF48 /* liblinphone.a in Frameworks */, + 2294997012A53FEE00D6CF48 /* libmediastreamer.a in Frameworks */, + 2294997112A53FEE00D6CF48 /* libortp.a in Frameworks */, + 2294997212A53FEE00D6CF48 /* libosip2.a in Frameworks */, + 2294997312A53FEE00D6CF48 /* libosipparser2.a in Frameworks */, + 2294997412A53FEE00D6CF48 /* libspeex.a in Frameworks */, + 2294997512A53FEE00D6CF48 /* libspeexdsp.a in Frameworks */, + 2294997612A53FEE00D6CF48 /* CFNetwork.framework in Frameworks */, + 2294997712A53FEE00D6CF48 /* CoreAudio.framework in Frameworks */, + 2294997812A53FEE00D6CF48 /* AudioToolbox.framework in Frameworks */, + 2294997912A53FEE00D6CF48 /* libresolv.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 229499A512A5417D00D6CF48 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 229499A612A5417D00D6CF48 /* Foundation.framework in Frameworks */, + 229499A712A5417D00D6CF48 /* UIKit.framework in Frameworks */, + 229499A812A5417D00D6CF48 /* CoreGraphics.framework in Frameworks */, + 229499A912A5417D00D6CF48 /* libeXosip2.a in Frameworks */, + 229499AA12A5417D00D6CF48 /* libgsm.a in Frameworks */, + 229499AB12A5417D00D6CF48 /* libilbc.a in Frameworks */, + 229499AC12A5417D00D6CF48 /* liblinphone.a in Frameworks */, + 229499AD12A5417D00D6CF48 /* libmediastreamer.a in Frameworks */, + 229499AE12A5417D00D6CF48 /* libortp.a in Frameworks */, + 229499AF12A5417D00D6CF48 /* libosip2.a in Frameworks */, + 229499B012A5417D00D6CF48 /* libosipparser2.a in Frameworks */, + 229499B112A5417D00D6CF48 /* libspeex.a in Frameworks */, + 229499B212A5417D00D6CF48 /* libspeexdsp.a in Frameworks */, + 229499B312A5417D00D6CF48 /* CFNetwork.framework in Frameworks */, + 229499B412A5417D00D6CF48 /* CoreAudio.framework in Frameworks */, + 229499B512A5417D00D6CF48 /* AudioToolbox.framework in Frameworks */, + 229499B612A5417D00D6CF48 /* libresolv.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 229499EA12A5433F00D6CF48 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 229499EB12A5433F00D6CF48 /* Foundation.framework in Frameworks */, + 229499EC12A5433F00D6CF48 /* UIKit.framework in Frameworks */, + 229499ED12A5433F00D6CF48 /* CoreGraphics.framework in Frameworks */, + 229499EE12A5433F00D6CF48 /* libeXosip2.a in Frameworks */, + 229499EF12A5433F00D6CF48 /* libgsm.a in Frameworks */, + 229499F012A5433F00D6CF48 /* libilbc.a in Frameworks */, + 229499F112A5433F00D6CF48 /* liblinphone.a in Frameworks */, + 229499F212A5433F00D6CF48 /* libmediastreamer.a in Frameworks */, + 229499F312A5433F00D6CF48 /* libortp.a in Frameworks */, + 229499F412A5433F00D6CF48 /* libosip2.a in Frameworks */, + 229499F512A5433F00D6CF48 /* libosipparser2.a in Frameworks */, + 229499F612A5433F00D6CF48 /* libspeex.a in Frameworks */, + 229499F712A5433F00D6CF48 /* libspeexdsp.a in Frameworks */, + 229499F812A5433F00D6CF48 /* CFNetwork.framework in Frameworks */, + 229499F912A5433F00D6CF48 /* CoreAudio.framework in Frameworks */, + 229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */, + 229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -91,6 +223,9 @@ isa = PBXGroup; children = ( 1D6058910D05DD3D006BFB54 /* hello-world.app */, + 2294997D12A53FEE00D6CF48 /* hello-world.app */, + 229499BA12A5417D00D6CF48 /* hello-world.app */, + 229499FF12A5433F00D6CF48 /* hello-world.app */, ); name = Products; sourceTree = ""; @@ -125,6 +260,9 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( + 2294995512A53FD800D6CF48 /* buddy_status.c */, + 2294995612A53FD800D6CF48 /* chatroom.c */, + 2294995712A53FD800D6CF48 /* registration.c */, 2220D596127844C9008F2C2E /* helloworld.c */, 32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */, ); @@ -134,7 +272,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 8D1107310486CEB800E47090 /* hello_world-Info.plist */, + 8D1107310486CEB800E47090 /* helloworld-Info.plist */, ); name = Resources; sourceTree = ""; @@ -152,9 +290,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* hello-world */ = { + 1D6058900D05DD3D006BFB54 /* helloworld */ = { isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "hello-world" */; + buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "helloworld" */; buildPhases = ( 1D60588D0D05DD3D006BFB54 /* Resources */, 1D60588E0D05DD3D006BFB54 /* Sources */, @@ -164,11 +302,62 @@ ); dependencies = ( ); - name = "hello-world"; + name = helloworld; productName = "hello-world"; productReference = 1D6058910D05DD3D006BFB54 /* hello-world.app */; productType = "com.apple.product-type.application"; }; + 2294996112A53FEE00D6CF48 /* registration */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2294997A12A53FEE00D6CF48 /* Build configuration list for PBXNativeTarget "registration" */; + buildPhases = ( + 2294996212A53FEE00D6CF48 /* Resources */, + 2294996312A53FEE00D6CF48 /* Sources */, + 2294996812A53FEE00D6CF48 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = registration; + productName = "hello-world"; + productReference = 2294997D12A53FEE00D6CF48 /* hello-world.app */; + productType = "com.apple.product-type.application"; + }; + 229499A112A5417D00D6CF48 /* chatroom */ = { + isa = PBXNativeTarget; + buildConfigurationList = 229499B712A5417D00D6CF48 /* Build configuration list for PBXNativeTarget "chatroom" */; + buildPhases = ( + 229499A212A5417D00D6CF48 /* Resources */, + 229499A312A5417D00D6CF48 /* Sources */, + 229499A512A5417D00D6CF48 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = chatroom; + productName = "hello-world"; + productReference = 229499BA12A5417D00D6CF48 /* hello-world.app */; + productType = "com.apple.product-type.application"; + }; + 229499E612A5433F00D6CF48 /* buddy_status */ = { + isa = PBXNativeTarget; + buildConfigurationList = 229499FC12A5433F00D6CF48 /* Build configuration list for PBXNativeTarget "buddy_status" */; + buildPhases = ( + 229499E712A5433F00D6CF48 /* Resources */, + 229499E812A5433F00D6CF48 /* Sources */, + 229499EA12A5433F00D6CF48 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = buddy_status; + productName = "hello-world"; + productReference = 229499FF12A5433F00D6CF48 /* hello-world.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -188,7 +377,10 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 1D6058900D05DD3D006BFB54 /* hello-world */, + 1D6058900D05DD3D006BFB54 /* helloworld */, + 2294996112A53FEE00D6CF48 /* registration */, + 229499A112A5417D00D6CF48 /* chatroom */, + 229499E612A5433F00D6CF48 /* buddy_status */, ); }; /* End PBXProject section */ @@ -201,6 +393,27 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 2294996212A53FEE00D6CF48 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 229499A212A5417D00D6CF48 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 229499E712A5433F00D6CF48 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -212,6 +425,30 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 2294996312A53FEE00D6CF48 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2294996712A53FEE00D6CF48 /* registration.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 229499A312A5417D00D6CF48 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 229499BD12A5419500D6CF48 /* chatroom.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 229499E812A5433F00D6CF48 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22DF2B1612A65892007C6B74 /* buddy_status.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -224,7 +461,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = hello_world_Prefix.pch; - INFOPLIST_FILE = "hello_world-Info.plist"; + INFOPLIST_FILE = "helloworld-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 3.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -242,7 +479,7 @@ COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = hello_world_Prefix.pch; - INFOPLIST_FILE = "hello_world-Info.plist"; + INFOPLIST_FILE = "helloworld-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 3.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -254,6 +491,123 @@ }; name = Release; }; + 2294997B12A53FEE00D6CF48 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = hello_world_Prefix.pch; + INFOPLIST_FILE = "helloworld-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\\\"$(SRCROOT)/../../liblinphone-sdk/apple-darwin/lib\\\"", + ); + PRODUCT_NAME = "hello-world"; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 2294997C12A53FEE00D6CF48 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = hello_world_Prefix.pch; + INFOPLIST_FILE = "helloworld-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\\\"$(SRCROOT)/../../liblinphone-sdk/apple-darwin/lib\\\"", + ); + PRODUCT_NAME = "hello-world"; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 229499B812A5417D00D6CF48 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = hello_world_Prefix.pch; + INFOPLIST_FILE = "helloworld-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\\\\\\\"$(SRCROOT)/../../liblinphone-sdk/apple-darwin/lib\\\\\\\"", + ); + PRODUCT_NAME = "hello-world"; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 229499B912A5417D00D6CF48 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = hello_world_Prefix.pch; + INFOPLIST_FILE = "helloworld-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\\\\\\\"$(SRCROOT)/../../liblinphone-sdk/apple-darwin/lib\\\\\\\"", + ); + PRODUCT_NAME = "hello-world"; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 229499FD12A5433F00D6CF48 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = hello_world_Prefix.pch; + INFOPLIST_FILE = "helloworld-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\\\\\\\\\\\\\\\"$(SRCROOT)/../../liblinphone-sdk/apple-darwin/lib\\\\\\\\\\\\\\\"", + ); + PRODUCT_NAME = "hello-world"; + SDKROOT = iphoneos; + }; + name = Debug; + }; + 229499FE12A5433F00D6CF48 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = hello_world_Prefix.pch; + INFOPLIST_FILE = "helloworld-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\\\\\\\\\\\\\\\"$(SRCROOT)/../../liblinphone-sdk/apple-darwin/lib\\\\\\\\\\\\\\\"", + ); + PRODUCT_NAME = "hello-world"; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -289,7 +643,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "hello-world" */ = { + 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "helloworld" */ = { isa = XCConfigurationList; buildConfigurations = ( 1D6058940D05DD3E006BFB54 /* Debug */, @@ -298,6 +652,33 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 2294997A12A53FEE00D6CF48 /* Build configuration list for PBXNativeTarget "registration" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2294997B12A53FEE00D6CF48 /* Debug */, + 2294997C12A53FEE00D6CF48 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 229499B712A5417D00D6CF48 /* Build configuration list for PBXNativeTarget "chatroom" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 229499B812A5417D00D6CF48 /* Debug */, + 229499B912A5417D00D6CF48 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 229499FC12A5433F00D6CF48 /* Build configuration list for PBXNativeTarget "buddy_status" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 229499FD12A5433F00D6CF48 /* Debug */, + 229499FE12A5433F00D6CF48 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; C01FCF4E08A954540054247B /* Build configuration list for PBXProject "hello-world" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/liblinphone-tutorials/hello-world/helloworld-Info.plist b/liblinphone-tutorials/hello-world/helloworld-Info.plist new file mode 100644 index 000000000..15665856b --- /dev/null +++ b/liblinphone-tutorials/hello-world/helloworld-Info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + ${PRODUCT_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + + CFBundleIdentifier + com.yourcompany.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + + diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 868cbffb9..d764d2600 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -269,7 +269,11 @@ multi-arch: delivery-sdk: multi-arch cd $(BUILDER_SRC_DIR)/../ \ && zip -r $(BUILDER_SRC_DIR)/liblinphone-iphone-sdk.zip \ - liblinphone-sdk/apple-darwin + liblinphone-sdk/apple-darwin \ + liblinphone-tutorials \ + -x liblinphone-tutorials/hello-world/build\* \ + -x liblinphone-tutorials/hello-world/hello-world.xcodeproj/*.pbxuser \ + -x liblinphone-tutorials/hello-world/hello-world.xcodeproj/*.mode1v3 delivery: cd $(BUILDER_SRC_DIR)/../ \ diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index fa8842be2..cc7b16c17 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -307,7 +307,6 @@ 222CA73411F6CFB100621220 /* enum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enum.h; sourceTree = ""; }; 222CA73811F6CFB100621220 /* friend.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = friend.c; sourceTree = ""; }; 222CA73B11F6CFB100621220 /* Doxyfile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Doxyfile.in; sourceTree = ""; }; - 222CA73C11F6CFB100621220 /* doxygen.dox.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = doxygen.dox.in; sourceTree = ""; }; 222CA73D11F6CFB100621220 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 222CA73E11F6CFB100621220 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; 222CA73F11F6CFB100621220 /* linphonecore.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linphonecore.c; sourceTree = ""; }; @@ -646,7 +645,6 @@ isa = PBXGroup; children = ( 222CA73B11F6CFB100621220 /* Doxyfile.in */, - 222CA73C11F6CFB100621220 /* doxygen.dox.in */, 222CA73D11F6CFB100621220 /* Makefile.am */, 222CA73E11F6CFB100621220 /* Makefile.in */, ); diff --git a/submodules/linphone b/submodules/linphone index f47dff36b..db5fe1c90 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f47dff36b064a44f011dd6f3ee09948e3ce1ad14 +Subproject commit db5fe1c90b84016b3474a617e437b64c28b30d81