Commit graph

76 commits

Author SHA1 Message Date
Sylvain Berfini
edfc1e004f New ZRTP dialog + ZRTP compiled by default 2013-09-02 13:07:42 +02:00
Sylvain Berfini
389d3177ec Use liblinphone chat storage as default 2013-08-19 15:05:04 +02:00
Ghislain MARY
3b91aad4f8 Enable HD video. 2013-08-19 11:42:51 +02:00
Sylvain Berfini
ed3626790a Disabled default compilation of sqlite + fix in build 2013-08-14 16:50:29 +02:00
Sylvain Berfini
4f888a5919 Added sqlite compilation to liblinphone 2013-08-08 12:46:41 +02:00
Sylvain Berfini
d320195dd8 Merge remote-tracking branch 'private/belle-sip'
Conflicts:
	Makefile
	submodules/externals/exosip
2013-07-29 16:07:37 +02:00
Jehan Monnier
aff60c792b update belle sip better support truncated messages 2013-07-19 10:43:07 +02:00
Guillaume Beraudo
846a2a3a58 Update ZRTPCPP to 2.3.4 2013-07-17 12:26:37 +02:00
Jehan Monnier
fa65b6ed31 fix liblinphone_tester build issue 2013-07-04 09:05:53 +02:00
Ghislain MARY
23b7fc05a9 Update linphone submodule. 2013-07-02 17:07:20 +02:00
Simon Morlat
0f2b1c2b25 fix Makefile, update linphone submodule
- add missing PayloadType object accessors
- SDP fix
2013-07-02 16:38:58 +02:00
Jehan Monnier
35fcb40f75 fix long cp arg issue on macosx build 2013-07-01 08:39:27 +02:00
Jehan Monnier
a9b83c5727 fix type in Makefile 2013-06-28 09:20:04 +02:00
Simon Morlat
22f1502fbf repair build (was broken to CA download) 2013-06-24 12:36:09 +02:00
Simon Morlat
997807fd3e fix Makefile 2013-06-20 10:48:03 +02:00
Simon Morlat
6d8b3945a6 repair liblinphone_tester 2013-06-19 15:07:43 +02:00
Sylvain Berfini
42e4cdc671 Merge remote-tracking branch 'master/master' into bellesip
Conflicts:
	.classpath
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	src/org/linphone/HistoryDetailFragment.java
	submodules/linphone
2013-06-12 10:59:39 +02:00
Sylvain Berfini
621eb9f5ec Fix some issues 2013-05-29 11:03:01 +02:00
Simon Morlat
8381de339a Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	Makefile
	src/org/linphone/KeepAliveHandler.java
	submodules/linphone
2013-05-07 16:55:22 +02:00
Ghislain MARY
44524d6698 Pass build options to make clean. 2013-05-02 10:39:30 +02:00
Jehan Monnier
9cf7c52213 add build option to disable polarssl 2013-04-02 09:18:25 +02:00
Simon Morlat
27e1b0d9ed Merge remote-tracking branch 'public/master' into bellesip 2013-03-28 09:11:09 +01:00
Simon Morlat
25af3cdda0 use git describe --always 2013-03-27 20:16:42 +01:00
Jehan Monnier
9eb7dfbc45 update msé/belle-sip 2013-03-18 09:18:24 +01:00
Yann Diorcet
f4c07d3467 Improve makefile and ant script 2013-03-13 11:36:15 +01:00
Yann Diorcet
3f78919820 Add liblinphone_tester to update project 2013-03-13 09:31:42 +01:00
Yann Diorcet
4981506f37 Fix makefile for liblinphone_tester (javah) 2013-03-12 16:37:12 +01:00
Yann Diorcet
47d0c15be2 Improve liblinphone_tester 2013-03-11 15:47:57 +01:00
Yann Diorcet
6ca676cd7b Add NDK_DEBUG in LIBLINPHONE_OPTIONS 2013-03-08 16:12:37 +01:00
Yann Diorcet
e24ec45fc6 Merge remote-tracking branch 'origin' into bellesip
Conflicts:
	Makefile
	submodules/linphone
2013-03-08 16:02:07 +01:00
Jehan Monnier
c3dca761a2 add video option to makefile 2013-03-08 10:02:21 +01:00
Yann Diorcet
0c3339afeb Add liblinphone tester project 2013-03-07 17:35:05 +01:00
Jehan Monnier
5f24d46d23 add new target generate-sdk 2013-03-04 15:24:16 +01:00
Yann Diorcet
ada976d278 Add NDK debug flag in Makefile 2013-02-28 14:05:53 +01:00
Yann Diorcet
2a302a66ab Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	.gitmodules
	submodules/linphone
2013-02-13 17:26:07 +01:00
Yann Diorcet
7defe94fc5 Add libupnp dependency for Android 2013-02-13 16:53:50 +01:00
Yann Diorcet
5b778995b5 Fix makefile in order to avoid recompilation of belle-sip/antlr each times 2013-02-07 11:51:56 +01:00
Yann Diorcet
0408e3eae8 Merge branch 'master' into bellesip
Conflicts:
	.gitmodules
	Makefile
	submodules/externals/build/exosip/Android.mk
	submodules/externals/exosip
	submodules/linphone
2013-02-06 12:22:28 +01:00
Yann Diorcet
2f6a101e54 Add xml2lpc/lpc2xml support and remote provisioning 2013-02-05 10:04:00 +01:00
Yann Diorcet
ef3a884311 Replace eXosip/osip by belle-sip
add a checktools utility
Add belle-sip
Add antlr3c
2013-01-23 14:08:55 +01:00
Sylvain Berfini
1322562fb5 Added back X264 compilation as default 2013-01-22 12:13:34 +01:00
Sylvain Berfini
2ea8a18947 Removed versionName from Manifest, asking while compiling release or set using git describe when compiling debug + value logged at linphone startup 2013-01-10 16:57:45 +01:00
Sylvain Berfini
5101fdc213 Remove x264 compilation by default + boolean to disable H264/MPEG4 2012-12-20 15:34:43 +01:00
Sylvain Berfini
bcc8ea078f Updated Makefile to separate make from make install 2012-12-19 12:17:33 +01:00
Sylvain Berfini
f78aee1efe Other changes for release 2012-12-13 14:32:50 +01:00
Sylvain Berfini
e597f769e5 Some changes to prepare the market release 2012-12-13 12:31:22 +01:00
Ghislain MARY
5860fd54cc Do not build for x86 by default. 2012-12-10 17:00:35 +01:00
Sylvain Berfini
c45e9e6df4 Updated Makefile for MacOSX 2012-12-06 12:08:55 +01:00
Ghislain MARY
c24007813e Do a version sort to find the android target version. 2012-12-04 11:46:32 +01:00
Sylvain Berfini
eee0b18507 Few changes 2012-12-03 17:07:12 +01:00