-lipo $INTELROOT/Contents/MacOS/lib/libSDL_image.0.dylib $PPCROOT/Contents/MacOS/lib/libSDL_image.0.dylib -create -output $UBROOT/Contents/MacOS/lib/libSDL_image.0.dylib
-lipo $INTELROOT/Contents/MacOS/lib/libSDL-1.3.0.dylib $PPCROOT/Contents/MacOS/lib/libSDL-1.3.0.dylib -create -output $UBROOT/Contents/MacOS/lib/libSDL-1.3.0.dylib
-lipo $INTELROOT/Contents/MacOS/lib/libjpeg.7.dylib $PPCROOT/Contents/MacOS/lib/libjpeg.7.dylib -create -output $UBROOT/Contents/MacOS/lib/libjpeg.7.dylib
-lipo $INTELROOT/Contents/MacOS/lib/libtiff.3.dylib $PPCROOT/Contents/MacOS/lib/libtiff.3.dylib -create -output $UBROOT/Contents/MacOS/lib/libtiff.3.dylib
-lipo $INTELROOT/Contents/MacOS/modules/libsdl_image_plugin.dylib $PPCROOT/Contents/MacOS/modules/libsdl_image_plugin.dylib -create -output $UBROOT/Contents/MacOS/modules/libsdl_image_plugin.dylib
-lipo $INTELROOT/Contents/MacOS/modules/libquartztext_plugin.dylib $PPCROOT/Contents/MacOS/modules/libquartztext_plugin.dylib -create -output $UBROOT/Contents/MacOS/modules/libquartztext_plugin.dylib
-lipo $INTELROOT/Contents/MacOS/modules/libgoom_plugin.dylib $PPCROOT/Contents/MacOS/modules/libgoom_plugin.dylib -create -output $UBROOT/Contents/MacOS/modules/libgoom_plugin.dylib
-cp $INTELROOT/Contents/MacOS/modules/*mmx* $UBROOT/Contents/MacOS/modules/
-cp $INTELROOT/Contents/MacOS/modules/*sse* $UBROOT/Contents/MacOS/modules/
-cp $INTELROOT/Contents/MacOS/modules/*3dn* $UBROOT/Contents/MacOS/modules/
-cp $PPCROOT/Contents/MacOS/modules/*altivec* $UBROOT/Contents/MacOS/modules/
-cp $PPCROOT/Contents/MacOS/lib/libvlc.dylib $UBROOT/Contents/MacOS/lib/
-cp $PPCROOT/Contents/MacOS/lib/libvlccore.dylib $UBROOT/Contents/MacOS/lib/
-
-# Now, you need to copy the resulting UBROOT bundle into VLC's build directory
+do_lipo $LIBS/libSDL_image.0.dylib
+do_lipo $LIBS/libtiff.3.dylib
+do_lipo $LIBS/libtiff.3.dylib
+do_lipo $PLUGINS/libsdl_image_plugin.dylib
+do_lipo $PLUGINS/libquartztext_plugin.dylib
+do_lipo $PLUGINS/libgoom_plugin.dylib
+if [ "x$INTELROOT" != "x" ]; then
+ cp $INTELROOT/$PLUGINS/*mmx* $UBROOT/$PLUGINS/
+ cp $INTELROOT/$PLUGINS/*3dn* $UBROOT/$PLUGINS/
+fi
+if [ "x$INTEL64ROOT" != "x" ]; then
+ cp $INTEL64ROOT/$PLUGINS/*sse* $UBROOT/$PLUGINS/
+fi
+if [ "x$PPCROOT" != "x" ]; then
+ cp $PPCROOT/Contents/MacOS/modules/*altivec* $UBROOT/Contents/MacOS/modules/
+ cp $PPCROOT/Contents/MacOS/lib/libvlc.dylib $UBROOT/Contents/MacOS/lib/
+ cp $PPCROOT/Contents/MacOS/lib/libvlccore.dylib $UBROOT/Contents/MacOS/lib/
+fi
+
+
+echo "Copying plugins.dat"
+set +x
+
+if [ "x$PPCROOT" != "x" ]; then
+ cp $PPCROOT/$PLUGINS/plugins-*.dat $UBROOT/$PLUGINS/
+fi
+if [ "x$INTELROOT" != "x" ]; then
+ cp $INTELROOT/$PLUGINS/plugins-*.dat $UBROOT/$PLUGINS/
+fi
+if [ "x$INTEL64ROOT" != "x" ]; then
+ cp $INTEL64ROOT/$PLUGINS/plugins-*.dat $UBROOT/$PLUGINS/
+fi
+
+
+# Now, you need to copy the resulting UBROOT bundle into VLC's build directory