Commit 314157be authored by Rafaël Carré's avatar Rafaël Carré
Browse files

contrib: remove yasm deps

build tools will be handled by extras/tools
parent 7f2a7295
...@@ -59,7 +59,6 @@ endif ...@@ -59,7 +59,6 @@ endif
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
FFMPEGCONF += --cpu=core2 FFMPEGCONF += --cpu=core2
endif endif
DEPS_ffmpeg += yasm $(DEPS_yasm)
endif endif
# Linux # Linux
......
...@@ -27,7 +27,6 @@ ifeq ($(ARCH),arm) ...@@ -27,7 +27,6 @@ ifeq ($(ARCH),arm)
VPX_ARCH := armv7 VPX_ARCH := armv7
else ifeq ($(ARCH),i386) else ifeq ($(ARCH),i386)
VPX_ARCH := x86 VPX_ARCH := x86
#DEPS_vpx += yasm $(DEPS_yasm)
else ifeq ($(ARCH),mips) else ifeq ($(ARCH),mips)
VPX_ARCH := mips32 VPX_ARCH := mips32
else ifeq ($(ARCH),ppc) else ifeq ($(ARCH),ppc)
...@@ -38,7 +37,6 @@ else ifeq ($(ARCH),sparc) ...@@ -38,7 +37,6 @@ else ifeq ($(ARCH),sparc)
VPX_ARCH := sparch VPX_ARCH := sparch
else ifeq ($(ARCH),x86_64) else ifeq ($(ARCH),x86_64)
VPX_ARCH := x86_64 VPX_ARCH := x86_64
#DEPS_vpx += yasm $(DEPS_yasm)
endif endif
ifdef HAVE_LINUX ifdef HAVE_LINUX
......
...@@ -25,12 +25,6 @@ else ...@@ -25,12 +25,6 @@ else
X264CONF += --enable-win32thread X264CONF += --enable-win32thread
endif endif
ifdef HAVE_MACOSX
ifneq ($(findstring $(ARCH),i386 x86_64),)
DEPS_x264 += yasm
endif
endif
$(TARBALLS)/x264-$(X264_VERSION).tar.gz: $(TARBALLS)/x264-$(X264_VERSION).tar.gz:
$(call download,$(X264_URL)) $(call download,$(X264_URL))
......
Supports Markdown
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