X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fx264%2Fmodule.defs;h=d6da3b00e3b464c57e9c832c4e74352df854b653;hb=57eb615dacce93ba40d3f84cba51c31bd682c10e;hp=eb6d5e64cd6458bd08e1ef36ea214fb98c2bb21e;hpb=d91cfc365f94f65aca99d45e4c4bb81d44be1a4c;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index eb6d5e64..d6da3b00 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,11 +1,20 @@
-$(eval $(call import.MODULE.defs,X264,x264))
+$(eval $(call import.MODULE.defs,X264,x264,PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url = http://download.m0k.org/handbrake/contrib/x264-r1109-75b495f.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1442-781d300.tar.gz
 X264.EXTRACT.tarbase = x264
 
 X264.CONFIGURE.deps   =
 X264.CONFIGURE.shared =
 X264.CONFIGURE.static =
 
-X264.CONFIGURE.extra = --disable-mp4-output --enable-pthread
+X264.CONFIGURE.extra = --disable-mp4-output
+X264.CONFIGURE.extra += --disable-avs-input --disable-lavf-input --disable-ffms-input
+
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    X264.CONFIGURE.extra += --enable-pthread --cross-prefix=$(BUILD.spec)-
+    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
+    X264.CONFIGURE.extra += --enable-pthread
+endif