X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fx264%2Fmodule.defs;h=8b5d99bbe692a52fd71517b47aed9508836963e6;hb=7c7b5f7d03cf46516e7a39f094c2e770fb2154fb;hp=9cd1ce18b8aed146e29001fc381b068ccb60910b;hpb=9c6b673a404e944ee056297c9d9e53d004317e88;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index 9cd1ce18..8b5d99bb 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,11 +1,18 @@
-$(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-r1125-10d6ef0.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1675-2484aa0.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-gpac
+X264.CONFIGURE.extra += --disable-avs --disable-lavf --disable-ffms
+
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    X264.CONFIGURE.extra += --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)"
+endif