mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-14 18:47:47 +00:00
Remove gcc import libraries from Win32 builds.
They weren't even installed, and [1] suggests linking directly to the dll. [1] http://sourceware.org/binutils/docs-2.18/ld/WIN32.html Originally committed as revision 10740 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9a3fb64000
commit
85aec3bd48
4
configure
vendored
4
configure
vendored
@ -1184,7 +1184,7 @@ case $targetos in
|
|||||||
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)'
|
||||||
SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"'
|
SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"'
|
||||||
SHFLAGS='-shared -Wl,--output-def,$(@:$(SLIBSUF)=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
|
SHFLAGS='-shared -Wl,--output-def,$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
|
||||||
;;
|
;;
|
||||||
cygwin*)
|
cygwin*)
|
||||||
targetos=cygwin
|
targetos=cygwin
|
||||||
@ -1200,7 +1200,7 @@ case $targetos in
|
|||||||
SLIBSUF=".dll"
|
SLIBSUF=".dll"
|
||||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
|
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
|
||||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
|
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
|
||||||
SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a -Wl,--enable-auto-image-base'
|
SHFLAGS='-shared -Wl,--enable-auto-image-base'
|
||||||
;;
|
;;
|
||||||
linux)
|
linux)
|
||||||
LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
|
LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
|
||||||
|
Loading…
Reference in New Issue
Block a user