diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 17:01:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 17:02:48 +0200 |
| commit | 1894f88546cff0200c1c2507b43f1837cdc007b1 (patch) | |
| tree | def48d905b124bcdcab6812fc249f633fde5cdac | |
| parent | 39b0d40d9219b895dbd1dd5ba5873f8594360750 (diff) | |
| download | ffmpeg-1894f88546cff0200c1c2507b43f1837cdc007b1.tar.gz | |
configure: add support for dlltool when lib.exe is unavailable
The lib.exe test is untested. Someone who has lib.exe please test and fix it if it doesnt work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -2878,7 +2878,7 @@ case $target_os in fi LIBTARGET=i386 if enabled x86_64; then - LIBTARGET=x64 + LIBTARGET="i386:x86-64" elif enabled arm; then LIBTARGET=arm-wince fi @@ -2887,7 +2887,15 @@ 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:$(SLIBSUF)=.lib)' + dlltool="${cross_prefix}dlltool" + if check_cmd lib.exe; then + SLIB_EXTRA_CMD='-lib.exe /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib)' + if enabled x86_64; then + LIBTARGET=x64 + fi + elif check_cmd $dlltool --version; then + SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)' + fi SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)' SLIB_INSTALL_LINKS= SLIB_INSTALL_EXTRA_SHLIB='$(SLIBNAME:$(SLIBSUF)=.lib)' @@ -3891,6 +3899,7 @@ DEPCC=$dep_cc DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS) DEPAS=$as DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) +DLLTOOL=$dlltool YASM=$yasmexe DEPYASM=$yasmexe AR=$ar |