diff options
Diffstat (limited to 'contrib/ffmpeg/module.defs')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 63ae39f44..af34b3a92 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -7,6 +7,8 @@ FFMPEG.EXTRACT.tarbase = ffmpeg-0.5 FFMPEG.CONFIGURE.deps = FFMPEG.CONFIGURE.env = FFMPEG.CONFIGURE.host = +#FFMPEG.CONFIGURE.shared = +#FFMPEG.CONFIGURE.static = FFMPEG.CONFIGURE.extra = \ --disable-bsfs \ @@ -21,19 +23,27 @@ FFMPEG.CONFIGURE.extra = \ --enable-gpl \ --enable-libfaad \ --enable-muxer=ipod \ - --enable-pthreads \ --enable-swscale \ --cc="$(GCC.gcc)" \ --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs ?extra) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" -ifeq ($(BUILD.cross),1) - FFMPEG.CONFIGURE.extra += --enable-cross-compile --arch=$(BUILD.machine) -endif - -ifeq (cygwin,$(BUILD.system)) - FFMPEG.CONFIGURE.extra += --enable-memalign-hack +## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag +ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system)) + FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-memalign-hack FFMPEG.GCC.args.extra = -fno-common +else ifeq (1-darwin,$(BUILD.cross)-$(BUILD.system)) + ## section for darwin-archs + FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine) +else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) + FFMPEG.CONFIGURE.extra += \ + --enable-w32threads \ + --enable-memalign-hack \ + --target-os=mingw32 \ + --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix) + FFMPEG.GCC.args.extra += -fno-common +else + FFMPEG.CONFIGURE.extra += --enable-pthreads endif # |