[FFmpeg-cvslog] configure: reduce difference to qatar by 2 lines
Michael Niedermayer
git at videolan.org
Thu Aug 2 04:48:13 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 2 00:41:16 2012 +0200| [98a2f4e87b5c9439cf66a36b1089c7168206f9b2] | committer: Michael Niedermayer
configure: reduce difference to qatar by 2 lines
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98a2f4e87b5c9439cf66a36b1089c7168206f9b2
---
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index ebd4d1b..6cd170e 100755
--- a/configure
+++ b/configure
@@ -2894,7 +2894,7 @@ case $target_os in
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)'
+ SLIB_EXTRA_CMD=-'$(DLLTOOL) -m $(LIBTARGET) -d $$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib) -D $(SLIBNAME_WITH_MAJOR)'
fi
SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
SLIB_INSTALL_LINKS=
@@ -3899,7 +3899,6 @@ DEPCC=$dep_cc
DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
-DLLTOOL=$dlltool
YASM=$yasmexe
DEPYASM=$yasmexe
AR=$ar
@@ -3918,6 +3917,7 @@ CC_O=$CC_O
CXX_C=$CXX_C
CXX_O=$CXX_O
LD_O=$LD_O
+DLLTOOL=$dlltool
LDFLAGS=$LDFLAGS
FFSERVERLDFLAGS=$FFSERVERLDFLAGS
SHFLAGS=$SHFLAGS
More information about the ffmpeg-cvslog
mailing list