Commit graph

116 commits

Author SHA1 Message Date
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
Guillaume Beraudo
d50e11ecbf Fix srtp patch not applying. 2011-09-08 12:37:36 +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
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
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
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
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
3a76a6b3fe ios: use --force-target option to enable x86 with darwin10 2011-08-04 08:52:57 +02:00
Pierre-Eric Pelloux-Prayer
8ae28404e1 ios: add vp8 compilation scripts 2011-08-03 15:51:23 +02:00
Jehan Monnier
2d04319a31 add msx264.mk 2011-07-22 10:00:46 +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
09640da0c0 start video integration 2011-07-08 18:06:50 +02:00
Jehan Monnier
969fe41041 Merge remote-tracking branch 'bc/master' into tunnel 2011-06-20 09:31:29 +02:00
Jehan Monnier
9df5beb02a fix libilbc veryclean 2011-06-20 09:24:19 +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
0bfd331928 start video on ios 2011-06-10 09:30:41 +02:00
Jehan Monnier
97084dfa71 add ffmpeg compilation 2011-06-07 14:47:32 +02:00
Jehan Monnier
72702a0cd8 Merge remote branch 'bc/master' into tunnel 2011-06-01 15:31:02 +02:00
Jehan Monnier
0416e6d41b fix incoming call display name
add compilation flad TARGET_OS_IPHONE to sdk
2011-06-01 15:26:03 +02:00
Jehan Monnier
bcbdf78416 Merge branch 'master' into tunnel 2011-04-19 17:50:38 +02:00
Jehan Monnier
18608ce038 update exosip for broken udp cnx 2011-04-19 17:50:00 +02:00
Jehan Monnier
d4afd3a3c7 Merge branch 'master' into tunnel 2011-04-12 14:58:03 +02:00
Jehan Monnier
1d56ea61db add minos-version to cxx build 2011-04-12 14:57:36 +02:00
Jehan Monnier
0a59882bcd remove ssl compilation from exosip 2011-04-12 10:00:06 +02:00
Jehan Monnier
c1e7f78f1a Merge branch 'master' into tunnel 2011-04-06 09:41:31 +02:00
Jehan Monnier
c58a073632 replace sysroot by isysroot as recommanded by apple 2011-04-06 09:37:52 +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
9b306f5560 fix wrong SPEEX_LIBS value 2011-04-04 19:02:22 +02:00
Jehan Monnier
3e91e6488a ad openamr build scripts 2011-04-04 14:56:37 +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
d94b86610f Merge remote branch 'bc/master' into tunnel
Conflicts:
	linphone.xcodeproj/project.pbxproj
2011-03-25 08:38:31 +01:00
Jehan Monnier
4735c62168 avoid //build for libgsm 2011-03-24 14:36:19 +01: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
be1999b391 Merge branch 'master' into tunnel
Conflicts:
	submodules/build/builder-iphone-os.mk
2011-03-19 18:31:27 +01:00
Jehan Monnier
3bdc6754cd build script cleanup 2011-03-19 18:26:10 +01:00