On Thu, 7 Jul 2011, Martin Storsjö wrote:
> On Thu, 7 Jul 2011, Diego Biurrun wrote:
>
> > On Thu, Jul 07, 2011 at 09:48:10AM +0300, Martin Storsjö wrote:
> > > The DLL without a version number in the file name, and the one
> > > with the full version, aren't used in practice on windows.
> > >
> > > --- a/configure
> > > +++ b/configure
> > > @@ -2426,6 +2426,8 @@ case $target_os in
> > > 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'
> > > + slib_major_only=yes
> > > + skip_unversioned_slib=yes
> > > objformat="win32"
> > > @@ -3244,6 +3246,9 @@ SLIB_CREATE_DEF_CMD=${SLIB_CREATE_DEF_CMD}
> > > SLIB_INSTALL_EXTRA_CMD=${SLIB_INSTALL_EXTRA_CMD}
> > > SLIB_UNINSTALL_EXTRA_CMD=${SLIB_UNINSTALL_EXTRA_CMD}
> > > +SLIB_MAJOR_ONLY=$(test "$slib_major_only" = "yes" && echo "" || echo
> > > "@\#")
> > > +SLIB_FULL_VERSION=$(test "$slib_major_only" = "yes" && echo "@\#" ||
> > > echo "")
> > > +SLIB_INSTALL_UNVERSIONED=$(test "$skip_unversioned_slib" = "yes" && echo
> > > "@\#" || echo "")
> > > SAMPLES:=${samples:-\$(FATE_SAMPLES)}
> >
> > something like
> >
> > slib_major_only='#'
> > SLIB_MAJOR_ONLY=$slib_major_only
> >
> > should do the trick as well.
>
> Perhaps yes, but you still need two variables in config.mak - to exclude
> either of the install commands in the makefile, where one of them is @#
> and the other one is empty (SLIB_MAJOR_ONLY and SLIB_FULL_VERSION in my
> patch).
These three patches are dropped, thanks to Måns' patch fixing it in a much
cleaner way.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
