mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't cancel non-GPL build when FFMPEG is activated.

Browse source 
Instead, disable it.
This commit is contained in:
Guillaume BIENKOWSKI 2013-10-21 16:10:20 +02:00
parent 69f88f2825
commit b60ca6b5f7
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
submodules/build/Makefile
View file

@ -35,7 +35,8 @@ ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes)
endif
ifeq ($(enable_gpl_third_parties)$(enable_ffmpeg),noyes)
CHECKOPT_MSG += "FFMPEG is not available in non-gpl build.\n"
# ffmpeg is not compatible with no GPL.
enable_ffmpeg:=no
endif
ifneq ($(CHECKOPT_MSG),"")