Sylvain Berfini
3b7c61e640
Merge branch 'master' into dev_vcard
...
Conflicts:
coreapi/CMakeLists.txt
coreapi/Makefile.am
coreapi/linphonecore.h
java/common/org/linphone/core/LinphoneCore.java
java/impl/org/linphone/core/LinphoneCoreImpl.java
2016-01-25 10:47:41 +01:00
Ghislain MARY
ba58c9f038
Support build for Windows 10 with CMake.
2016-01-21 17:06:59 +01:00
Sylvain Berfini
bfc7630ada
This should fix vcard tester
2016-01-21 14:40:00 +01:00
François Grisez
071581ffac
Declare LinphoneConference and LinphoneConferenceParams in conference.h instead of linphonecore.h
2016-01-18 12:03:53 +01:00
Sylvain Berfini
63ec344f3b
Updated CMakeLists to easy merge with master
2016-01-18 10:42:57 +01:00
Sylvain Berfini
39b2596744
Added carddav.c to CMakeLists.txt and Android.mk
2016-01-15 11:40:00 +01:00
Sylvain Berfini
44e18649ac
Merge branch 'master' into dev_vcard
...
Conflicts:
build/android/Android.mk
coreapi/CMakeLists.txt
coreapi/Makefile.am
coreapi/friend.c
coreapi/linphonecore.c
coreapi/linphonecore.h
2016-01-08 10:37:54 +01:00
François Grisez
38dfb9ab6f
Merge branch 'dev_conference_rfc4579'
2016-01-07 10:13:04 +01:00
Gautier Pelloux-Prayer
b711888ac0
ringplayer: add ring player object to play ringtones (CAF on iOS, WAV otherwise)
2016-01-05 10:31:23 +01:00
Sylvain Berfini
3695a15374
Fix cmake compilation of vcard.cc
2015-12-22 17:24:39 +01:00
Sylvain Berfini
9001f40f1a
Updated CMake files for belcard and belr
2015-12-21 14:45:59 +01:00
Ghislain MARY
fb6d0dd135
Merge branch 'dev_presence_list'
2015-12-18 15:01:10 +01:00
Ghislain MARY
f002a15267
Improve git version header generation with CMake.
2015-12-15 10:51:13 +01:00
François Grisez
99252460f4
Create a C++ interface in order to abstract conference systems
...
The actual conference system has been transposed as an
implementation of the freshly created interface
2015-11-30 16:36:37 +01:00
Ghislain MARY
3b6eceaad4
Add the LinphoneFriendList object.
2015-11-23 17:41:09 +01:00
Ghislain MARY
7f2a985d84
Handle strict compilation flags when building with CMake.
2015-11-03 17:40:24 +01:00
Ghislain MARY
141098e434
Improve header files handling in CMake.
2015-10-23 10:47:48 +02:00
Ghislain MARY
42d58b77a7
Add header files to source files with CMake.
2015-10-22 17:33:18 +02:00
Ghislain MARY
8ab1343c16
Fix build with CMake.
2015-10-21 15:01:41 +02:00
Ghislain MARY
4b28d3a933
Search for iconv quietly when building with CMake.
2015-10-19 15:43:15 +02:00
Ghislain MARY
00e96f59f7
Regenerate liblinphone_gitversion.h with CMake when the git revision has changed.
2015-10-15 15:40:46 +02:00
Ghislain MARY
ec9d484152
Fix CMake warnings.
2015-10-14 14:59:06 +02:00
Ghislain MARY
6f2dc7153d
Change CMake targets export name when grouping projects with the linphone-cmake-builder.
2015-10-13 11:28:29 +02:00
Gautier Pelloux-Prayer
461876a9a3
chat.c: split chat and file transfer in 2 files and fix various memory leaks
2015-09-22 14:03:26 +02:00
Gautier Pelloux-Prayer
617b753562
CMakeLists.txt: add missing include file
2015-07-29 15:17:04 +02:00
Gautier Pelloux-Prayer
d9f41fff5a
proxy config: modify linphone_proxy_config_get_contact and add linphone_proxy_config_get_identity_address returning LinphoneAddress and move all documentation to linphone_proxy_config.h
2015-07-29 13:26:53 +02:00
François Grisez
d8e8f4488d
Merge branch '3.8.x'
2015-07-02 16:47:56 +02:00
François Grisez
547822cd9f
Fix internationalisation with CMake #2
2015-07-02 09:47:29 +02:00
François Grisez
86f215ef03
Enable internationalisation of liblinphone with CMake
2015-06-30 16:50:34 +02:00
François Grisez
238702d610
Enable internationalisation of liblinphone with CMake
2015-06-30 16:48:17 +02:00
Ghislain MARY
c5e3bd5809
Build account creator and xmlrpc on Android and WP8 + install header files.
2015-06-09 08:30:59 +02:00
Ghislain MARY
26fac3e081
Rework assistant for asynchronous XML-RPC requests.
2015-06-08 15:52:44 +02:00
Ghislain MARY
a152132b1e
Remove check for libsoup.
2015-06-08 15:48:44 +02:00
Ghislain MARY
cbae403a1f
Handle XML-RPC request in liblinphone directly instead of using libsoup.
2015-06-08 15:43:55 +02:00
Ghislain MARY
17cad99e4f
Rework assistant for asynchronous XML-RPC requests.
2015-06-05 15:49:47 +02:00
Ghislain MARY
7b3d7861e2
Remove check for libsoup.
2015-06-02 11:15:21 +02:00
Ghislain MARY
16eba02ebf
Handle XML-RPC request in liblinphone directly instead of using libsoup.
2015-06-02 11:02:23 +02:00
Ghislain MARY
2dc157e76f
Add option to enable/disable documentation generation when building with CMake.
2015-04-15 16:04:13 +02:00
Ghislain MARY
c66a00ff24
Do not try to search for libgcc and libmingwex when building for Windows Phone.
2015-04-07 16:14:25 +02:00
Ghislain MARY
8b1d56ea9e
Fix build with CMake on Mac OS X.
2015-04-03 14:19:52 +02:00
Ghislain MARY
47a2c1c0bf
Add "lib" prefix for the DLL name when building for Windows Phone with CMake.
2015-03-30 11:37:37 +02:00
Ghislain MARY
e57b0da00b
Add check for zlib when building with CMake.
2015-03-23 18:14:51 +01:00
Ghislain MARY
72c628819e
Fix build with CMake for Windows Phone.
2015-03-23 16:26:36 +01:00
Ghislain MARY
1ee545b722
Add lime.c for build with CMake.
2015-03-13 09:37:07 +01:00
Simon Morlat
c7a6cb0986
fix vtables
...
linphone_core_remove_listener() can safely be called from within a callback.
don't destroy the vtable in linphone_core_destroy(), similar to what is done with linphone_core_remove_listener().
2015-03-10 15:25:02 +01:00
Ghislain MARY
e205995d89
Do not search for libiconv on Windows when building with CMake.
2015-03-09 09:33:25 +01:00
Ghislain MARY
ce1126b290
Use a config-file package instead of a find-module package in CMake.
2015-03-06 11:14:37 +01:00
Ghislain MARY
773726ff72
Fix build with CMake (MS2 -> Mediastreamer2).
2015-03-05 18:04:47 +01:00
Ghislain MARY
695ad3d6e8
Add FindIconv to CMake build.
2015-03-02 14:19:27 +01:00
Ghislain MARY
800909073d
Set correct soversion when building with CMake.
2015-01-06 17:36:40 +01:00
