Commit graph

39 commits

Author SHA1 Message Date
Simon Morlat
eecb65d1d4 Merge remote-tracking branch 'public/master' into dev_videoios
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	Classes/LinphoneUI/LinphoneUIDelegates.h
	Classes/LinphoneUI/UILinphone.h
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	linphonerc
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-01 22:20:12 +01:00
Simon Morlat
b9db786072 fix for sRTP not installed in multi-arch liblinphone-sdk, due to unidentified archives. 2011-10-26 23:48:11 +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
ddeaddf92d Merge remote-tracking branch 'public/master' into dev_videoios
IOS migration

Conflicts:
	.gitignore
	.gitmodules
	linphone-Info.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/build/iphone-config.site
	submodules/externals/osip
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2011-10-19 11:36:27 +02:00
Jehan Monnier
2635db3b74 fix audio for IOS5 2011-10-14 16:14:54 +02:00
Sylvain Berfini
24ae96def3 Merge branch 'master' of git://git.linphone.org/linphone-iphone 2011-09-08 15:57:34 +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
745a9037eb Zrtp should not be compiled by default. 2011-09-08 12:39:03 +02:00
Sylvain Berfini
bfff840cb2 Bug fixes on iPhone 3G 2011-09-07 16:00:34 +02:00
Guillaume Beraudo
c288f87bfb Patches for srtp and zrtp. 2011-09-06 14:51:14 +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
da9ec193d5 Merge branch 'master' into dev_videoios
Conflicts:
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/linphone
2011-08-20 12:35:07 +02:00
Simon Morlat
6ff81c7b14 disable nls 2011-08-10 15:18:07 +02:00
Simon Morlat
38cfc7bcda disable strict for linphone compilation 2011-08-10 14:47:09 +02:00
Pierre-Eric Pelloux-Prayer
8ae28404e1 ios: add vp8 compilation scripts 2011-08-03 15:51:23 +02:00
Jehan Monnier
e7c7c87534 merge with master 1.0.6 except submodule linphone 2011-07-20 16:44:02 +02:00
Jehan Monnier
6cd52eb015 enable x264 2011-07-20 16:36:13 +02:00
Jehan Monnier
e2d6829fe3 auto tools port for ios video 2011-07-13 10:30:49 +02:00
Jehan Monnier
9df5beb02a fix libilbc veryclean 2011-06-20 09:24:19 +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
0bfd331928 start video on ios 2011-06-10 09:30:41 +02:00
Jehan Monnier
18608ce038 update exosip for broken udp cnx 2011-04-19 17:50:00 +02:00
Jehan Monnier
9b306f5560 fix wrong SPEEX_LIBS value 2011-04-04 19:02:22 +02:00
Jehan Monnier
a9ab705dfa add AMR support. Should be use with compilation flag HAVE_AMR 2011-04-04 14:54:28 +02:00
Jehan Monnier
a9c99bbec5 prepare apple store submision version 1.0.4 2011-03-28 15:23:07 +02:00
Jehan Monnier
4735c62168 avoid //build for libgsm 2011-03-24 14:36:19 +01:00
Jehan Monnier
13399e424a migrate liblinphone sdk compilation to xcode4 2011-03-23 14:01:05 +01:00
Jehan Monnier
3bdc6754cd build script cleanup 2011-03-19 18:26:10 +01:00
Jehan Monnier
95fba137a9 compile openssl from source 2011-03-19 18:23:27 +01:00
Jehan Monnier
b558703c8f add build script for open ssl 2011-03-18 20:18:34 +01:00
Jehan Monnier
cc67c802d5 Merge branch 'linphone', remote branch 'bc/master' into linphone
Conflicts:
	submodules/build/builder-iphone-os.mk
2011-03-16 13:23:41 +01:00
Jehan Monnier
4904b9fbb1 fix CONFIG_SITE issue upon configure.ac changes 2011-03-15 20:06:44 +01:00
Jehan Monnier
3e6ce03132 fix clean-makefile target 2011-03-10 12:19:04 +01:00
Jehan Monnier
4c2456acbf add ssl compilation for srtp 2011-03-10 10:43:21 +01:00
Jehan Monnier
5c514335bb update tutorials xcode project to use tuto files from sdk 2010-12-03 15:18:25 +01:00
Jehan Monnier
a30e5b61ef fix REAME + SPEEX_LIB to avoid referencing speexdsp from macport 2010-07-19 17:13:26 +02:00
Jehan Monnier
d0493e41a2 add build scripts 2010-07-18 22:31:52 +02:00