Commit graph

60 commits

Author SHA1 Message Date
Sylvain Berfini
75934a5400 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
54a4b96a13 Fix some issues 2013-05-29 11:03:01 +02:00
Simon Morlat
335212cb89 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
76179f1019 Pass build options to make clean. 2013-05-02 10:39:30 +02:00
Jehan Monnier
c19dfa0f11 add build option to disable polarssl 2013-04-02 09:18:25 +02:00
Simon Morlat
d63cfc9c1f Merge remote-tracking branch 'public/master' into bellesip 2013-03-28 09:11:09 +01:00
Simon Morlat
a9c826117b use git describe --always 2013-03-27 20:16:42 +01:00
Jehan Monnier
a2a498e0b2 update msé/belle-sip 2013-03-18 09:18:24 +01:00
Yann Diorcet
73a56d0372 Improve makefile and ant script 2013-03-13 11:36:15 +01:00
Yann Diorcet
c05cef7274 Add liblinphone_tester to update project 2013-03-13 09:31:42 +01:00
Yann Diorcet
3164a62300 Fix makefile for liblinphone_tester (javah) 2013-03-12 16:37:12 +01:00
Yann Diorcet
d541705fdd Improve liblinphone_tester 2013-03-11 15:47:57 +01:00
Yann Diorcet
0da1c3e2eb Add NDK_DEBUG in LIBLINPHONE_OPTIONS 2013-03-08 16:12:37 +01:00
Yann Diorcet
9be8020d4f Merge remote-tracking branch 'origin' into bellesip
Conflicts:
	Makefile
	submodules/linphone
2013-03-08 16:02:07 +01:00
Jehan Monnier
e3efa8dfc7 add video option to makefile 2013-03-08 10:02:21 +01:00
Yann Diorcet
894581b6d2 Add liblinphone tester project 2013-03-07 17:35:05 +01:00
Jehan Monnier
3b34477d4d add new target generate-sdk 2013-03-04 15:24:16 +01:00
Yann Diorcet
4b67883477 Add NDK debug flag in Makefile 2013-02-28 14:05:53 +01:00
Yann Diorcet
bfc8d392e2 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
1b98d34e9a Add libupnp dependency for Android 2013-02-13 16:53:50 +01:00
Yann Diorcet
a4a1636017 Fix makefile in order to avoid recompilation of belle-sip/antlr each times 2013-02-07 11:51:56 +01:00
Yann Diorcet
188fa09cf4 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
72b10a1f32 Add xml2lpc/lpc2xml support and remote provisioning 2013-02-05 10:04:00 +01:00
Yann Diorcet
0fd4a38909 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
040159db93 Added back X264 compilation as default 2013-01-22 12:13:34 +01:00
Sylvain Berfini
fd75511d06 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
0267fefa46 Remove x264 compilation by default + boolean to disable H264/MPEG4 2012-12-20 15:34:43 +01:00
Sylvain Berfini
816fe1c9b4 Updated Makefile to separate make from make install 2012-12-19 12:17:33 +01:00
Sylvain Berfini
7adc54a795 Other changes for release 2012-12-13 14:32:50 +01:00
Sylvain Berfini
5ea18420ad Some changes to prepare the market release 2012-12-13 12:31:22 +01:00
Ghislain MARY
40c254fb67 Do not build for x86 by default. 2012-12-10 17:00:35 +01:00
Sylvain Berfini
91cab88673 Updated Makefile for MacOSX 2012-12-06 12:08:55 +01:00
Ghislain MARY
4c2eb1a61a Do a version sort to find the android target version. 2012-12-04 11:46:32 +01:00
Sylvain Berfini
ede0906180 Few changes 2012-12-03 17:07:12 +01:00
Sylvain Berfini
7ee446bd5b Improved Makefile 2012-12-03 13:13:13 +01:00
Sylvain Berfini
a0912d7f3f Use custom rule partial-clean to remove right file named after ant project 2012-11-27 12:44:42 +01:00
Sylvain Berfini
f4f49aaf8b Updated Makefile/Readme 2012-11-27 12:06:05 +01:00
Jehan Monnier
0178a70aa6 fix prepare-vpx 2012-11-27 11:38:03 +01:00
Jehan Monnier
d8b2b70978 optimize Makefile speed 2012-11-27 11:05:09 +01:00
Ghislain MARY
b625901bc2 Add WebRTC echo canceller. 2012-11-13 17:15:56 +01:00
Ghislain MARY
30fd973c45 Define USE_JAVAH to generate the linphonecore_jni.h file. 2012-10-25 15:56:25 +02:00
Ghislain MARY
ebfc5d2106 Use git version instead of version from configure.ac. 2012-10-23 15:31:47 +02:00
Ghislain MARY
e99fb60293 Improve all target of makefile. 2012-10-23 11:39:00 +02:00
Ghislain MARY
2d150fd2a3 Improve build.xml to prevent copying the one from the Android SDK. 2012-10-22 15:53:25 +02:00
Sylvain Berfini
e4678c9131 Makefile improved, added new target run-tests to compile and run JUnit tests 2012-10-01 15:48:38 +02:00
Sylvain Berfini
f59f2ab276 Sending pictures through chat 2012-09-14 16:54:57 +02:00
Sylvain Berfini
a1fdf17f18 ZRTP enabled + popup to validate/unvalidate correspondent 2012-09-06 17:02:19 +02:00
Sylvain Berfini
180e0d9a78 Fix compilation with updated linphone 2012-08-09 09:38:07 +02:00
Guillaume Beraudo
4e56979f44 Makefile: No parenthesis for getting Linphone version
Otherwise make would complain about no closing parenthesis.
2012-08-07 16:08:21 +02:00
Simon Morlat
61b78dd445 fix detection of version number 2012-08-03 13:45:45 +02:00