X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fx264%2Fmodule.defs;h=04844a5f085da9e1d1247e76bb3fe90e9850cab1;hb=68c7f5802ce088e9e381a455f82a1d527d5fc607;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..04844a5f 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,11 +1,19 @@
-$(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.m0k.org/handbrake/contrib/x264-r1159-3da3f95.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
+
+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 ?extra)"
+    X264.CONFIGURE.env.LDFLAGS = LDFLAGS=-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)
+else
+    X264.CONFIGURE.extra += --enable-pthread
+endif