Changeset ba98f2bd51b7e1f7a7f5ca69807774894fd05e30

Show
Ignore:
Timestamp:
08/18/06 17:10:21 (2 years ago)
Author:
Damien Fouilleul <damienf@videolan.org>
git-committer:
Damien Fouilleul <damienf@videolan.org> 1155913821 +0000
git-parent:

[0307453712f8bac7bd6940cc21e211df0334fdec]

git-author:
Damien Fouilleul <damienf@videolan.org> 1155913821 +0000
Message:

- fixed Cygwin issue when linking/building shared libvlc.dll

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • bootstrap

    rf15c486 rba98f2b  
    217217 
    218218if BUILD_SHARED 
    219 LIBVLC = \$(top_builddir)/src/libvlc\$(LIBEXT) 
     219LIBVLC = -L\$(top_builddir)/src -lvlc 
    220220LIBADD = \$(LIBVLC) 
    221221endif 

  • src/Makefile.am

    r7b006d7 rba98f2b  
    191191if HAVE_WIN32 
    192192if BUILD_SHARED 
    193 DATA_noinst_libvlc = libvlc$(LIBEXT) 
     193DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a 
    194194endif 
    195195 
    196196libvlc.dll.a: libvlc$(LIBEXT) 
     197    $(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS) 
    197198 
    198199libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins 
    …… 
    205206    echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \ 
    206207    $$ld $(libvlc_a_OBJECTS) \ 
    207         -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl 
     208        $$ldfl 
    208209# It sucks big time, but we have to do that to link vlc properly 
    209210# on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over 
    210211# libvlc$(LIBEXT) 
    211212    rm -f libvlc.a 
    212 # Cygwin work-around 
     213# Cygwin libtool work-around 
    213214    @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi 
    214215endif