Commit graph

34 commits

Author SHA1 Message Date
Jehan Monnier
2b892c2cfb remove lib silk fromxcode 2011-11-04 14:35:00 +01:00
Guillaume Beraudo
fb2ddd1b33 Silk plugin for iPhone. 2011-11-03 13:44:49 +01:00
Guillaume
4b4319a628 Partial commit with changes on Sylvain's Mac. 2011-10-28 16:29:31 +02:00
Simon Morlat
b838ecebd3 Merge branch 'master' into tunnel
and fix srtp compilation (arch not set in archives).
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
2011-10-26 23:01:19 +02:00
Jehan Monnier
db47f93693 fix for silk 2011-10-21 23:11:29 +02:00
Jehan Monnier
1984838e1b add silk support 2011-10-21 16:05:43 +02:00
Jehan Monnier
04a9435c2a update linphone/ms2 with silk 2011-10-20 10:21:00 +02:00
Jehan Monnier
df20927668 fix for IOS 5 2011-10-14 18:03:40 +02:00
Jehan Monnier
2635db3b74 fix audio for IOS5 2011-10-14 16:14:54 +02:00
Guillaume Beraudo
2ec412b969 Srtp version from 1.4.2 to 1.4.4.
Required by zrtp.c.
2011-09-09 14:20:33 +02:00
Guillaume Beraudo
5a982c98e4 Fix zrtpcpp CmakeFilesList.txt only once copy 2011-09-08 16:16:23 +02:00
Guillaume Beraudo
08353ff038 Fix second build fail due to zrtp/cmake
CMakeFileLists.txt was overwritten for each architecture target.
CMake was then confused as the CMakeFileLists.txt was newer than the
generated Makefile, cache.

CMake would forget the options passed during generation of Makefile,
leading to compilation of unwanted ccRrtp.
2011-09-08 14:19:12 +02:00
Guillaume Beraudo
d50e11ecbf Fix srtp patch not applying. 2011-09-08 12:37:36 +02:00
Guillaume Beraudo
c288f87bfb Patches for srtp and zrtp. 2011-09-06 14:51:14 +02:00
Guillaume Beraudo
bbdd908e4a Don't compile ZRTPCPP when zrtp is disabled. 2011-09-01 11:16:38 +02:00
Guillaume Beraudo
de7f71a1ce Fix build 2011-08-29 09:11:36 +02:00
Guillaume Beraudo
63745b55fd Compilation chain for ZRTP (no implementation) 2011-08-26 18:41:46 +02:00
Simon Morlat
4820c3b36d Implement tunnel server reconnection
Merge branch 'master' into tunnel

Conflicts:
	linphone.xcodeproj/project.pbxproj
2011-08-20 16:49:18 +02:00
Simon Morlat
d173e75f79 fix bad tab in makefile ! 2011-08-17 22:14:03 +02:00
Simon Morlat
6e8a6a7a51 fix trouble with lastest opencore amr (configure script was removed) 2011-08-10 22:19:27 +02:00
Jehan Monnier
d09570ff31 Merge remote-tracking branch 'bc/master' into tunnel 2011-06-17 10:20:00 +02:00
Jehan Monnier
11e7ad3911 fix veryclean for msamr 2011-06-17 10:18:08 +02:00
Jehan Monnier
1f687ef981 Merge remote-tracking branch 'bc/master' into tunnel
Conflicts:
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
2011-06-17 10:13:20 +02:00
Jehan Monnier
db866e00ab add make veryclean target
fix tcp incoming call
update libilbc submodule
2011-06-16 16:18:41 +02:00
Jehan Monnier
0a59882bcd remove ssl compilation from exosip 2011-04-12 10:00:06 +02:00
Jehan Monnier
6e97edcafd Merge remote branch 'bc/master' into tunnel
Conflicts:
	.gitmodules
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
2011-04-05 18:55:49 +02:00
Jehan Monnier
3e91e6488a ad openamr build scripts 2011-04-04 14:56:37 +02:00
Jehan Monnier
b45617f37a add no-dso to openssl compil 2011-03-24 11:23:34 +01:00
Jehan Monnier
a08d63f4fc Merge branch 'master' into tunnel
Conflicts:
	submodules/build/builder-iphone-os.mk
2011-03-23 15:51:07 +01:00
Jehan Monnier
13399e424a migrate liblinphone sdk compilation to xcode4 2011-03-23 14:01:05 +01:00
Jehan Monnier
d353f79527 Merge branch 'build-ssl' into tunnel
Conflicts:
	submodules/build/builder-iphone-os.mk
2011-03-19 17:56:33 +01:00
Jehan Monnier
661853b70a fix openssl build 2011-03-18 20:55:06 +01:00
Jehan Monnier
b558703c8f add build script for open ssl 2011-03-18 20:18:34 +01:00
Jehan Monnier
a0f30669db implement tunnel 2011-03-17 12:36:25 +01:00