mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-30 09:49:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1674 commits 24 branches 118 tags 149 MiB
Commit graph

39 commits

Author SHA1 Message Date
Guillaume BIENKOWSKI
9b6dec1bf9 Add an sdk target to the main Makefile and refactor repetitions into generic targets. 
With this we can now trigger rebuild of a specific submodule (make build-libvpx will rebuild all libvpx)
 2014-06-12 16:51:20 +02:00
Jehan Monnier
884d4a1dca use git submodule status instead of ls to check tunnel mode 2014-04-23 17:21:22 +02:00
Simon Morlat
2eddb8ad81 merge tunnel branch into main branch so that source code is exactly the same in the two branches. 
The only difference is the presence of the submodules/tunnel .
 2014-04-23 09:36:55 +02:00
Simon Morlat
81ce1181b4 restore tunnel build, fix crash occuring with lastest polarssl 2014-04-22 23:37:46 +02:00
Simon Morlat
3376388982 Merge remote-tracking branch 'public/master' into tunnel 
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
 2014-04-14 12:52:00 +02:00
Guillaume BIENKOWSKI
b0e95c9934 Added a target to zip the iOS resources for rebranding. 2014-01-24 13:59:14 +01:00
Guillaume BIENKOWSKI
5fa1feef61 Fix typo 2014-01-15 11:13:11 +01:00
Jehan Monnier
834ca0e371 re-enable zrtp 2014-01-14 16:20:10 +01:00
Guillaume BIENKOWSKI
1ec60999ab Merge remote-tracking branch 'public/master' into tunnel 
Conflicts:
	Classes/LinphoneManager.h
	Classes/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk

+ Made modifications to the tunnel compilation so that it builds without openssl.
 2013-11-05 10:54:23 +01:00
Guillaume BIENKOWSKI
b60ca6b5f7 Don't cancel non-GPL build when FFMPEG is activated. 
Instead, disable it.
 2013-10-21 16:10:20 +02:00
Guillaume BIENKOWSKI
4bc6556a15 Re-enable ffmpeg in master 
+ typo in veryclean
 2013-10-18 11:03:15 +02:00
Guillaume BIENKOWSKI
1e27d3d3d7 Disable FFMPEG for Appstore build 2013-10-11 16:33:50 +02:00
Guillaume BIENKOWSKI
a9fbf3b36a Modification of the build process to enable GPL 
builds without FFMPEG.
Also simplified the process of adding options that
require a reconfiguration of the linphone build.
 2013-10-09 17:26:34 +02:00
Jehan Monnier
9027042134 add debug option to sdk build 2013-07-03 18:38:39 +02:00
Jehan Monnier
86699c4bb7 fix msiounit 2013-06-14 17:15:11 +02:00
Simon Morlat
479031cbc8 add polarssl into the build and update srtp to fix duplicated symbols 2013-05-09 18:08:47 +02:00
Ghislain MARY
9686dce6d3 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-17 11:49:40 +01:00
Jehan Monnier
c126a5172d remove armv6 build 
Conflicts:

	README
 2012-09-26 16:43:55 +02:00
Jehan Monnier
286efef8ae remove armv6 build 2012-09-21 22:29:33 +02:00
Jehan Monnier
20ef4a2469 xcode 4.6/ios6 support 
Conflicts:

	submodules/linphone
 2012-09-18 15:55:11 +02:00
Jehan Monnier
0cfc20b8da xcode 4.6/ios6 support 2012-09-18 10:32:00 +02:00
Simon Morlat
9af95dc58e Merge remote-tracking branch 'origin/master' into tunnel 
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/externals/exosip
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
	submodules/mssilk
 2012-04-26 15:09:04 +02:00
Jehan Monnier
c4f494a537 put all target first 2012-04-03 11:04:22 +02:00
Simon Morlat
46f934eaf2 repair gpl build 2012-03-26 17:13:06 +02:00
Simon Morlat
da017901fc make zrtp compilation optional 2012-03-26 12:27:24 +02:00
Simon Morlat
4e2de700fb Merge branch 'master' into tunnel 
Conflicts:
	.gitmodules
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
 2012-03-16 15:50:55 +01:00
Yann Diorcet
0de57c7d28 Fix ipa rule 2012-02-15 14:12:08 +01:00
Yann Diorcet
8fb0c59da9 Add rule to make ipa 2012-02-15 13:01:24 +01:00
Jehan Monnier
34051bf247 update with new tunnel api 2011-12-22 14:18:21 +01:00
Guillaume Beraudo
8d81fc2ba1 Multi call / conference tunnel support. 2011-12-20 18:12:40 +01:00
Simon Morlat
e03056ae6e Merge branch 'master' into tunnel 
not fully working
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
	submodules/build/builders.d/openssl.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
 2011-12-12 18:28:03 +01:00
Jehan Monnier
5d49e8d5d8 fix Could not read socket issue + speex issue 2011-11-28 12:36:45 +01:00
Jehan Monnier
8a1c3000cd merge vios IOS with master 2011-11-18 14:23:41 +01:00
Jehan Monnier
2635db3b74 fix audio for IOS5 2011-10-14 16:14:54 +02:00
Guillaume Beraudo
63745b55fd Compilation chain for ZRTP (no implementation) 2011-08-26 18:41:46 +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
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