]> granicus.if.org Git - handbrake/commitdiff
fix building x264 on mingw
authorjstebbins <jstebbins.hb@gmail.com>
Thu, 21 Jan 2010 04:39:58 +0000 (04:39 +0000)
committerjstebbins <jstebbins.hb@gmail.com>
Thu, 21 Jan 2010 04:39:58 +0000 (04:39 +0000)
x264 now tries to link to lavf if it thinks it can
explicitely disable lavf, avs and ffms support

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3079 b64f7644-9d1e-0410-96f1-a4d463321fa5

contrib/x264/module.defs

index 85f7e721231ea479473cb7e3f63651af33be539a..8321d96460c1591d5247e07564b900c1ad439015 100644 (file)
@@ -12,6 +12,7 @@ X264.CONFIGURE.extra = --disable-mp4-output
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     X264.CONFIGURE.extra += --enable-pthread --cross-prefix=$(BUILD.spec)-
+    X264.CONFIGURE.extra += --disable-avs-input --disable-lavf-input --disable-ffms-input
     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)"
 else