Skip to content

V
vlc-gpu
Commit f0cececc authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

contribs: ffmpeg depends on yasm and we build it from source on osx

parent 89c63668
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
extras/contrib/src/contrib-src.mak
View file @ f0cececc
...@@ -1122,13 +1122,14 @@ ifeq ($(ARCH),armel) ...@@ -1122,13 +1122,14 @@ ifeq ($(ARCH),armel)
HAVE_ARMELF=1 HAVE_ARMELF=1
endif endif
FFMPEG_DEPS-$(ENABLED) = .lame .gsm .libvpx .zlib FFMPEG_DEPS-$(ENABLED) = .lame .gsm .libvpx .zlib
FFMPEG_DEPS-$(HAVE_WINCE) = .zlib FFMPEG_DEPS-$(HAVE_WINCE) = .zlib
FFMPEG_DEPS-$(HAVE_UCLIBC) = FFMPEG_DEPS-$(HAVE_UCLIBC) =
FFMPEG_DEPS-$(HAVE_IOS) = FFMPEG_DEPS-$(HAVE_IOS) =
FFMPEG_DEPS-$(HAVE_WIN64) = .lame .gsm .zlib FFMPEG_DEPS-$(HAVE_WIN64) = .lame .gsm .zlib
FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib
FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers FFMPEG_DEPS-$(HAVE_MACOSX) += .yasm
FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers
ifdef SVN ifdef SVN
FFMPEG_MK_TARGET = ffmpeg/.svn-co FFMPEG_MK_TARGET = ffmpeg/.svn-co
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment