Commit graph

174 commits

Author SHA1 Message Date
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
467356148d Fix libilbc cleanup. 2013-11-04 12:24:11 +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
521c008f24 Some commands for distclean in FFMPEG fail in OSX,
so don't account on these. We simply remove the 
folder afterwards.
2013-10-15 09:27:13 +02:00
Guillaume BIENKOWSKI
7f944c91d0 Merge branch 'master' into apple_store
Conflicts:
	Classes/SettingsViewController.m
2013-10-14 17:11:07 +02:00
Guillaume BIENKOWSKI
779a0909d8 Optimized the build system for something shorter. 2013-10-14 17:06:54 +02:00
Guillaume BIENKOWSKI
1e27d3d3d7 Disable FFMPEG for Appstore build 2013-10-11 16:33:50 +02:00
Guillaume BIENKOWSKI
4627ff65cd Typo in mssilk builder 2013-10-10 10:45:35 +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
Guillaume BIENKOWSKI
518dd9e9c7 Enable PIE for ffmpeg and x264.
Note that the x264 compilation seems to generate non-PIC code even though the option is passed.
2013-10-04 10:25:08 +02:00
Guillaume BIENKOWSKI
be2b671628 Fix i386 compilation, which was triggering link errors for the iPhoneSimulator target. 2013-10-03 14:49:34 +02:00
Guillaume BIENKOWSKI
3eec08773c Disable the gcc in opencore-amr, which fixes compiler issue (was producing x86 versions even for arm targets…) 2013-10-02 11:24:21 +02:00
Guillaume BIENKOWSKI
cc6074ad33 + Fix x264 patch not applied after a clean
+ Fix libvpx and zrtp compilation for XCode 4.x

Overall, we transition from using gcc to using clang all the way. This solves some tricky problems with -mtune options and architecture-dependant configure issues.
2013-10-01 17:41:37 +02:00
Guillaume BIENKOWSKI
ce17708a34 Re-enable x264 patching and fix patch file. 2013-10-01 08:58:14 +02:00
Guillaume BIENKOWSKI
e053a0ee19 Fix compilation process for XCode 5 and following.
Transitioned to using Clang instead of GCC everywhere possible,
including x264 (some ASM was modified for that)
2013-09-30 17:32:46 +02:00
Jehan Monnier
3f0f82b6ea add --disable-tutorial to sdk 2013-08-27 17:43:23 +02:00
Simon Morlat
7b61902477 remove ffmpeg patch, no longer necessary 2013-07-13 10:23:02 +02:00
Simon Morlat
eb9958044b update to newer ffmpeg 2013-07-12 23:54:51 +02:00
Jehan Monnier
c9035d911b fix abusive display name in history 2013-07-12 11:04:42 +02:00
Jehan Monnier
9027042134 add debug option to sdk build 2013-07-03 18:38:39 +02:00
Ghislain MARY
d23851a3f1 Deactivate iconv and zlib to compile libxml2. 2013-06-20 17:49:52 +02:00
Ghislain MARY
b7dc49f290 Compile libxml2. 2013-06-20 15:41:40 +02:00
Jehan Monnier
86699c4bb7 fix msiounit 2013-06-14 17:15:11 +02:00
Jehan Monnier
7ba162c58b Merge branch 'belle-sip' of git.linphone.org:linphone-iphone-private into belle-sip 2013-06-04 10:35:37 +02:00
Jehan Monnier
8f74160e83 Merge remote-tracking branch 'origin/master' into belle-sip
Conflicts:
	.gitmodules
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/build/builders.d/libvpx.mk
	submodules/build/builders.d/mssilk.mk
	submodules/build/builders.d/opencore-amr.mk
	submodules/build/iphone-config.site
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2013-06-04 10:31:39 +02:00
Jehan Monnier
2339dce285 port sdk to clang except for mssilk & opencore-amr 2013-06-03 09:00:48 +02:00
Simon Morlat
5db768ff29 update sip stack for new debug traces 2013-05-31 18:24:03 +02:00
Jehan Monnier
7162af2c3d add opus submodule 2013-05-27 22:07:52 +02:00
Ghislain MARY
f870e7b6a2 Merge branch 'master' of git.linphone.org:linphone-iphone into tunnel 2013-05-23 11:40:37 +02:00
Jehan Monnier
bd5fccb963 update libvpx to v1.2.0 2013-05-22 16:13:35 +02:00
Jehan Monnier
5ea8097ddd update libvpx to v1.2.0 2013-05-22 16:13:35 +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
Simon Morlat
c422b7b553 Merge remote-tracking branch 'public/master' into belle-sip
and add polarssl
Conflicts:
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2013-05-07 22:55:03 +02:00
Ghislain MARY
49baee893d Install the tutorials source code in the sdk zip and use this installed source code in the tutorials xcode project. 2013-04-10 12:27:29 +02:00
Ghislain MARY
814545b13c Install the tutorials source code in the sdk zip and use this installed source code in the tutorials xcode project. 2013-04-10 12:27:29 +02:00
Jehan Monnier
b01f675674 enable push with belle-sip 2013-03-08 15:47:57 +01:00
Jehan Monnier
23a54227aa first belle-sip version 2013-02-27 14:51:03 +01:00
Yann Diorcet
233f22e5d7 Merge branch 'master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/x264.mk
2013-01-15 12:58:42 +01:00
Ghislain MARY
c0c3d29058 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-20 08:46:28 +01:00
Ghislain MARY
4aa170c387 Fix x264 build. 2012-12-20 08:45:16 +01: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
93c8a62dbd fix x264 bug on iphone5 2012-11-09 02:04:10 +01:00
Simon Morlat
8fac0fa65e update openssl 2012-09-26 22:46:07 +02: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
8a50dae15a fix build for xcode4.4 2012-09-18 15:55:36 +02:00
Jehan Monnier
20ef4a2469 xcode 4.6/ios6 support
Conflicts:

	submodules/linphone
2012-09-18 15:55:11 +02:00
Jehan Monnier
b226d0de32 fix build for xcode4.4 2012-09-18 15:04:47 +02:00
Jehan Monnier
0cfc20b8da xcode 4.6/ios6 support 2012-09-18 10:32:00 +02:00