collecting also vlc's plugins
This commit is contained in:
parent
007e8098a3
commit
08d71327ed
|
@ -1 +1 @@
|
||||||
Subproject commit 33ce71e245cece77f2815b007622302c3171c90a
|
Subproject commit 27ff0347ed20d53bfd2a1629821da437409afc65
|
|
@ -22,9 +22,9 @@ sync_support_libs(){
|
||||||
local _cp="/bin/cp"
|
local _cp="/bin/cp"
|
||||||
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
#local skip_deps="libm.so libpthread.so libstdc++.so libgcc_s.so libc.so libdl.so libX11.so libpulse libfusion libdirect libnvidia libXext librt libxcb libICE libSM libXtst libwrap libdbus libXau libXdmcp libnsl libFLAC libGL"
|
||||||
local skip_deps=""
|
local skip_deps=""
|
||||||
local keep_deps="libcurl libgnu libgcrypt libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc"
|
local keep_deps="libcurl libgnu libgcrypt libicu liblua libjpeg libpng libwx libgtk libgdk libftgl libfreetype libvlc"
|
||||||
|
|
||||||
local scan_via_skiplist=1
|
local scan_via_skiplist=1
|
||||||
|
|
||||||
if [ -n "$skip_deps" ]; then
|
if [ -n "$skip_deps" ]; then
|
||||||
scan_via_skiplist=1
|
scan_via_skiplist=1
|
||||||
|
@ -86,8 +86,7 @@ sync_support_libs(){
|
||||||
}
|
}
|
||||||
|
|
||||||
usage(){
|
usage(){
|
||||||
echo "Syntax : $0 megaglest
|
echo "Error: Wrong syntax. Example: $0 megaglest"
|
||||||
echo "Example: $0 megaglest
|
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -101,3 +100,16 @@ for f in $file
|
||||||
do
|
do
|
||||||
sync_support_libs "${BASE}" "${f}"
|
sync_support_libs "${BASE}" "${f}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# copy vlc's plugins if libvlc was copied
|
||||||
|
if [ "$(find $BASE -type f -name "libvlc.*")" != "" ]; then
|
||||||
|
LIBVLC_DIR_CHECK="$( ldd "$1" | grep "libvlc\." | sort -u | awk '{print $3}' | head -1 )"
|
||||||
|
if [ "$LIBVLC_DIR_CHECK" != "" ]; then
|
||||||
|
LIBVLC_DIR="$(dirname "$LIBVLC_DIR_CHECK")"
|
||||||
|
if [ -d "$LIBVLC_DIR/vlc/plugins" ]; then
|
||||||
|
mkdir -p "$BASE/vlc"
|
||||||
|
echo "Including plugins directory for VLC from = [$LIBVLC_DIR/vlc]"
|
||||||
|
cp -f -r "$LIBVLC_DIR/vlc/plugins" "$BASE/vlc/"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
|
@ -256,20 +256,6 @@ if [ $REPACKONLY -eq 0 ]; then
|
||||||
$copyGlestDeptsCmd
|
$copyGlestDeptsCmd
|
||||||
if [ -e "${INSTALL_ROOTDIR}makedeps_folder.sh" ]; then rm -f "${INSTALL_ROOTDIR}makedeps_folder.sh"; fi
|
if [ -e "${INSTALL_ROOTDIR}makedeps_folder.sh" ]; then rm -f "${INSTALL_ROOTDIR}makedeps_folder.sh"; fi
|
||||||
|
|
||||||
# If this part -V- is required then should be moved to 'makedeps_folder.sh' script
|
|
||||||
#cd "$CURRENTDIR"
|
|
||||||
#cd data
|
|
||||||
#LIBVLC_DIR_CHECK=$( ldd megaglest | grep "libvlc\." | sort -u | awk '{print $3}' )
|
|
||||||
#if [ "$LIBVLC_DIR_CHECK" != '' ]; then
|
|
||||||
# LIBVLC_DIR=$( dirname $LIBVLC_DIR_CHECK )
|
|
||||||
#fi
|
|
||||||
|
|
||||||
#echo LibVLC installed in [$LIBVLC_DIR] copying to lib/
|
|
||||||
#if [ "$LIBVLC_DIR" != '' ]; then
|
|
||||||
# cp -r $LIBVLC_DIR/vlc lib/
|
|
||||||
# #exit 1
|
|
||||||
#fi
|
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -270,6 +270,9 @@ fi
|
||||||
if [ "$OperatingMode" = "--game" ]; then
|
if [ "$OperatingMode" = "--game" ]; then
|
||||||
if [ -d "$GAMEDIR/$LIBDIR" ]; then
|
if [ -d "$GAMEDIR/$LIBDIR" ]; then
|
||||||
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${GAMEDIR}/${LIBDIR}"
|
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${GAMEDIR}/${LIBDIR}"
|
||||||
|
if [ -d "$GAMEDIR/$LIBDIR/vlc" ]; then
|
||||||
|
export VLC_PLUGIN_PATH="${GAMEDIR}/${LIBDIR}/vlc"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
$GAMEDIR/megaglest $@
|
$GAMEDIR/megaglest $@
|
||||||
ExitStatus="$?"
|
ExitStatus="$?"
|
||||||
|
|
|
@ -88,6 +88,17 @@ $list_of_libs2" | sed '/:$/d' | sed '/^$/d' | sort -u )"
|
||||||
for dyn_lib in $list_of_libs; do
|
for dyn_lib in $list_of_libs; do
|
||||||
cp "$dyn_lib" "lib/"
|
cp "$dyn_lib" "lib/"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [ "$(find lib -type f -name "libvlc.*")" != "" ]; then
|
||||||
|
LIBVLC_DIR_CHECK="$( echo "$list_of_checked_libs" | tr ' ' '\n' | grep "libvlc\." | sort -u | head -1 )"
|
||||||
|
if [ "$LIBVLC_DIR_CHECK" != "" ]; then
|
||||||
|
LIBVLC_DIR="$(cd "$(dirname "$LIBVLC_DIR_CHECK")"; pwd)"
|
||||||
|
if [ -d "$LIBVLC_DIR/vlc/plugins" ]; then
|
||||||
|
mkdir -p "lib/vlc"
|
||||||
|
cp -f -r "$LIBVLC_DIR/vlc/plugins" "lib/vlc/"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo 'Error: Please run first at least once build-mg.sh script to be ready for prepare directory with dynamic libraries.'
|
echo 'Error: Please run first at least once build-mg.sh script to be ready for prepare directory with dynamic libraries.'
|
||||||
# strange method but required for cpack/.dmg
|
# strange method but required for cpack/.dmg
|
||||||
|
|
Loading…
Reference in New Issue