diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-24 02:21:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-24 02:22:00 +0100 |
| commit | 15cfc6c97d403d06cf6ea0bc6ba5eb8e493857c2 (patch) | |
| tree | f3d57dc90278d091cce239696f810123c155a3eb /configure | |
| parent | 4940d1c0aec9223d92aeead551492c81c18d8c60 (diff) | |
| parent | b4eafa8b04802f45a710e712f2ec2676e0a77024 (diff) | |
| download | ffmpeg-15cfc6c97d403d06cf6ea0bc6ba5eb8e493857c2.tar.gz | |
Merge remote-tracking branch 'newdev/release/0.6' into release/0.6
* newdev/release/0.6:
Support writing 2d float arrays.
Add missing dependencies for the AAC-HE backport for hardcoded tables
configure: Add the -D parameter to the dlltool command
Set the correct target for mingw64 dlltool
configure: use dlltools instead of lib.exe
release notes and changelog for 0.6.2
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -2206,7 +2206,7 @@ case $target_os in LIBTARGET=i386 if enabled x86_64; then enable malloc_aligned - LIBTARGET=x64 + LIBTARGET="i386:x86-64" elif enabled arm; then LIBTARGET=arm fi @@ -2216,7 +2216,7 @@ case $target_os in SLIBSUF=".dll" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' - SLIB_EXTRA_CMD='-lib.exe /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)' + SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)' SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"; \ install -m 644 $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"; \ install -d "$(LIBDIR)"; \ @@ -2224,6 +2224,7 @@ case $target_os in SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(SHLIBDIR)/$(SLIBNAME:$(SLIBSUF)=.lib)"' SHFLAGS='-shared -Wl,--output-def,$$(@:$(SLIBSUF)=.def) -Wl,--out-implib,$(SUBDIR)lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base' objformat="win32" + dlltool="${cross_prefix}dlltool" enable dos_paths check_cflags -fno-common if ! enabled x86_64; then @@ -3002,6 +3003,7 @@ CPPFLAGS=$CPPFLAGS CFLAGS=$CFLAGS ASFLAGS=$ASFLAGS CC_O=$CC_O +DLLTOOL=$dlltool LDFLAGS=$LDFLAGS FFSERVERLDFLAGS=$FFSERVERLDFLAGS SHFLAGS=$SHFLAGS |