From: Pierre d'Herbemont <pdherbemont@free.fr>
Date: Mon, 15 Mar 2010 12:04:08 +0000 (+0100)
Subject: VLCKit: Embed the plugin cache for all archs.
X-Git-Tag: 1.1.0-pre1~372
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d1786b248b374353e9466ff32d9e5f8e221ec0f7;p=vlc

VLCKit: Embed the plugin cache for all archs.
---

diff --git a/projects/macosx/framework/Pre-Compile.sh b/projects/macosx/framework/Pre-Compile.sh
index de9da9d52e..84bad86c19 100644
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -237,12 +237,24 @@ for module in `find ${main_build_dir}/modules -path "*dylib.dSYM*" -prune -o -na
     fi
 done
 
+##########################
 # Install the module cache
-cache=`ls ${main_build_dir}/modules/plugins-*.dat | sed -e s:${main_build_dir}/::`
-vlc_install `dirname ${cache}` `basename ${cache}` ${target_plugins} "data"
+if test "$use_archs" = "no"; then
+    cache=`ls ${main_build_dir}/modules/plugins-*.dat | sed -e s:${main_build_dir}/::`
+    vlc_install `dirname ${cache}` `basename ${cache}` ${target_plugins} "data"
+else
+    for arch in $ARCHS; do
+        build="${VLC_BUILD_DIR}/${arch}"
+        cache=`ls ${build}/modules/plugins-*.dat | sed -e s:${build}/::`
+
+        # The cache is arch dependant. Use vlc_install_object directly.
+        vlc_install_object "${cache}" "${target_plugins}" "data"
+    done;
+fi
+
 
-# Build the lib folder
 ##########################
+# Build the lib folder
 
 vlc_install "src/${prefix}" "libvlc.5.dylib" "${target_lib}" "lib"
 vlc_install "src/${prefix}" "libvlccore.4.dylib" "${target_lib}" "lib"