From d3eb32a2076c4a34aefeab1f939fe070c45ea5b0 Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Thu, 28 Dec 2017 13:48:31 -0500 Subject: [PATCH] contrib: Remove yasm from x264 module. --- contrib/x264/module.defs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index ee71e70f1..220e756e8 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -1,4 +1,4 @@ -$(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32)) +$(eval $(call import.MODULE.defs,X264,x264,PTHREADW32)) $(eval $(call import.CONTRIB.defs,X264)) X264.FETCH.url = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20171225-2245.tar.bz2 @@ -17,8 +17,3 @@ ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)" X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)" endif - -ifeq (1,$(FEATURE.local_yasm)) - X264.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" - X264.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" -endif -- 2.40.0