mirror of https://git.ffmpeg.org/ffmpeg.git
Remove MinGW install path special-casing.
patch by Ramiro Polla, angustia arrozcru no-ip org Originally committed as revision 7230 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a083f53c45
commit
e48dc873a4
|
@ -838,9 +838,9 @@ for opt do
|
||||||
;;
|
;;
|
||||||
--log=*) logging="$optval"
|
--log=*) logging="$optval"
|
||||||
;;
|
;;
|
||||||
--prefix=*) PREFIX="$optval"; force_prefix=yes
|
--prefix=*) PREFIX="$optval"
|
||||||
;;
|
;;
|
||||||
--libdir=*) libdir="$optval"; force_libdir=yes
|
--libdir=*) libdir="$optval"
|
||||||
;;
|
;;
|
||||||
--shlibdir=*) shlibdir="$optval"
|
--shlibdir=*) shlibdir="$optval"
|
||||||
;;
|
;;
|
||||||
|
@ -1066,9 +1066,6 @@ EOF
|
||||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
|
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
|
||||||
SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)"
|
SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)"
|
||||||
SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a)"
|
SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a)"
|
||||||
if test "$force_prefix" != yes; then PREFIX="$PROGRAMFILES/FFmpeg"; fi
|
|
||||||
if test "$force_libdir" != yes; then bindir='${PREFIX}'; fi
|
|
||||||
shlibdir='${PREFIX}'
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Combine FFLDFLAGS and the LDFLAGS environment variable.
|
# Combine FFLDFLAGS and the LDFLAGS environment variable.
|
||||||
|
|
Loading…
Reference in New Issue