Changeset a55cd54a8ef95952fe88852e42448a355af56f7c

Show
Ignore:
Timestamp:
04/15/08 22:31:55 (5 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1208291515 +0200
git-parent:

[c64426b9ddac138ccad991fdf0c0f1f1f0a38333]

git-author:
VideoLAN <videolan@jones.via.ecp.fr> 1208291148 +0200
Message:

macosx: Fix VLC-release.app library links.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • Makefile.am

    r01a95e7 ra55cd54  
    451451    rm -Rf $(top_builddir)/tmp 
    452452    $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS 
    453     $(INSTALL) $(top_builddir)/src/.libs/vlc \ 
    454            $(top_builddir)/VLC-release.app/Contents/MacOS/VLC 
    455     ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc 
    456     $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules 
    457     for i in "" `$(VLC_CONFIG) --target plugin` ; do \ 
    458       if test -n "$$i" ; \ 
    459         then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ 
    460                "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \ 
    461       fi ; done 
    462     $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \ 
    463       for i in $(srcdir)/src/.libs/*.dylib ; do \ 
    464         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \ 
    465       done ; 
     453    ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh 
    466454    $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist 
    467455    for i in $(srcdir)/share/lua/playlist/*.* ; do \ 
  • projects/macosx/framework/Pre-Compile.sh

    r6feab08 ra55cd54  
    9191    # Hack for VLC-release.app 
    9292    if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then 
    93         install_library "${VLC_BUILD_DIR}/${prefix}vlc" "${target}" "bin" "@loader_path/lib" 
    9493        prefix=".libs/" 
     94        install_library "${VLC_BUILD_DIR}/src/${prefix}vlc" "${target}" "bin" "@loader_path/lib" 
     95        mv ${target}/vlc ${target}/VLC 
     96        chmod +x ${target}/VLC 
    9597    else 
    9698        prefix=""