X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fx264%2Fmodule.defs;h=c1009d9387a2fd70d01af638d9c23e7cd0fdb991;hb=c593146bf3fab6290c71cbbb974e0a756e43f5e0;hp=93430a4e1a115b9115eefb894bea9c07f46e94e0;hpb=2327fee8183124631ba4b43e0b35f984e1b85a3a;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index 93430a4e..c1009d93 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -1,4 +1,4 @@ -$(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-r1130-8475977.tar.gz @@ -8,4 +8,12 @@ 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