Commit a55cd54a authored by VideoLAN's avatar VideoLAN Committed by Pierre d'Herbemont

macosx: Fix VLC-release.app library links.

parent c64426b9
...@@ -450,19 +450,7 @@ VLC-release.app: vlc ...@@ -450,19 +450,7 @@ VLC-release.app: vlc
$(top_builddir)/VLC-release.app; \ $(top_builddir)/VLC-release.app; \
rm -Rf $(top_builddir)/tmp rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
$(INSTALL) $(top_builddir)/src/.libs/vlc \ ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
$(top_builddir)/VLC-release.app/Contents/MacOS/VLC
ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; \
then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
"$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
fi ; done
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
for i in $(srcdir)/src/.libs/*.dylib ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
done ;
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
for i in $(srcdir)/share/lua/playlist/*.* ; do \ for i in $(srcdir)/share/lua/playlist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
......
...@@ -90,8 +90,10 @@ if test "${ACTION}" = "build"; then ...@@ -90,8 +90,10 @@ if test "${ACTION}" = "build"; then
########################## ##########################
# Hack for VLC-release.app # Hack for VLC-release.app
if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then
install_library "${VLC_BUILD_DIR}/${prefix}vlc" "${target}" "bin" "@loader_path/lib"
prefix=".libs/" prefix=".libs/"
install_library "${VLC_BUILD_DIR}/src/${prefix}vlc" "${target}" "bin" "@loader_path/lib"
mv ${target}/vlc ${target}/VLC
chmod +x ${target}/VLC
else else
prefix="" prefix=""
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment