diff options
| author | konablend <[email protected]> | 2009-03-10 22:43:11 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2009-03-10 22:43:11 +0000 |
| commit | 246cf371553c120192011d5c10274160b2d48156 (patch) | |
| tree | feb1da997e272a3655df19f2b0dfeca05f5ca70c /contrib/ffmpeg/module.defs | |
| parent | e4f62edf63f41d9fd7c63d1a22cb05810a58d003 (diff) | |
Cygwin: ffmpeg build tweaks
- bug: issues with universal input (including aac in mp4, wmv etc)
- fix: add -fno-common to GCC
- correctness: add --enable-memalign-hack as per ffmpeg docs
- these issues were possibly a regression introduced with the new build system
- a positive side effect to the build system is the availability of new makevar
'<MODULE>.GCC.args.extra' which is a free-form way to add extra cflags to GCC functions.
[this changeset does not effect any other platforms]
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2252 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/module.defs')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index f045ad5b0..8c6c9d1e4 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -24,9 +24,14 @@ FFMPEG.CONFIGURE.extra = \ --enable-pthreads \ --enable-swscale \ --cc="$(GCC.gcc)" \ - --extra-cflags="$(call fn.ARGS,FFMPEG.GCC,*archs) -I$(call fn.ABSOLUTE,$(CONTRIB.build/)include)" \ - --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" + --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 + FFMPEG.GCC.args.extra = -fno-common +endif |