[MPlayer-dev-eng] [PATCH] Windows DLL support for OS X/Intel (cleaned version)

[Bernd Ernesti]

On Tue, Nov 21, 2006 at 07:38:50AM +0100, Bernd Ernesti wrote:
> On Tue, Nov 21, 2006 at 06:53:45AM +0100, Bernd Ernesti wrote:
> > On Mon, Nov 20, 2006 at 10:30:17PM -0500, Nicolas Plourde wrote:
> > > Index: Makefile
> > > ===================================================================
> > > --- Makefile	(revision 21118)
> > > +++ Makefile	(working copy)
> > > @@ -106,7 +106,7 @@
> > >          libaf \
> > >  
> > >  ifeq ($(WIN32DLL),yes)
> > > -COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a
> > > +COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a osdep/libosdep.a
> > >  PARTS += loader loader/dshow loader/dmo
> > >  endif
> > >  ifeq ($(MP3LIB),yes)
> > 
> > That would mean that we would include osdep/libosdep.a two times.
> > 
> > Btw, it would have been nice if you attached the patch at the end and not at the
> > top. I just noticed that you added a comment at the end of this mail.
> 
> Oh, and I had no chance yet to test it at all due too build errors.
> 
> Now, someone (Diego?) decided to make libdha a shared library which breaks the
> binary when I try to start mplayer:
> 
> Shared object "libdha.so.1.0" not found
> 
> Thats wasn't such a good idea.

And it was too early for me to find the real reason for this failure.
libdha is now for a long time a shared library. The problem was the
addition of libdha.so in the main Makefile.

Attached is a patch which removes it again.

Bernd

-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 21118)
+++ Makefile	(working copy)
@@ -130,7 +130,7 @@
 PARTS += tremor
 endif
 ifeq ($(VIDIX),yes)
-VO_LIBS += libdha/libdha.so vidix/libvidix.a
+VO_LIBS += vidix/libvidix.a
 PARTS += libdha vidix
 endif
 ifeq ($(DVDREAD_INTERNAL),yes)