- get rid of bin subfolder and place binaries in root folder with startup scripts to avoid trouble finding game data since glest.ini by default looks for data in binary root folder

This commit is contained in:
Mark Vejvoda 2011-05-07 10:01:32 +00:00
parent 020cac4455
commit 9bcd0288f4
2 changed files with 7 additions and 8 deletions

View File

@ -130,7 +130,6 @@ if [ $REPACKONLY -eq 0 ]; then
rm -rf data rm -rf data
mkdir data mkdir data
mkdir data/bin
mkdir data/blender mkdir data/blender
INSTALL_ROOTDIR=$CURRENTDIR/ INSTALL_ROOTDIR=$CURRENTDIR/
@ -140,16 +139,16 @@ if [ $REPACKONLY -eq 0 ]; then
echo Copying live Mega Glest binary files... echo Copying live Mega Glest binary files...
cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest" ${INSTALLDATADIR}bin cp "$CURRENTDIR/$megaglest_linux_path/megaglest" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_linux_path/glest.ini" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/glest.ini" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest.bmp" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/megaglest.bmp" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/glestkeys.ini" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/glestkeys.ini" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_configurator" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_configurator" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest_configurator" ${INSTALLDATADIR}bin cp "$CURRENTDIR/$megaglest_linux_path/megaglest_configurator" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_mapeditor" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_mapeditor" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest_editor" ${INSTALLDATADIR}bin cp "$CURRENTDIR/$megaglest_linux_path/megaglest_editor" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_g3dviewer" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/start_megaglest_g3dviewer" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/megaglest_g3dviewer" ${INSTALLDATADIR}bin cp "$CURRENTDIR/$megaglest_linux_path/megaglest_g3dviewer" ${INSTALLDATADIR}
cp "$CURRENTDIR/$megaglest_linux_path/servers.ini" $INSTALLDATADIR cp "$CURRENTDIR/$megaglest_linux_path/servers.ini" $INSTALLDATADIR
cp "$CURRENTDIR/$megaglest_linux_path/makedeps_folder.sh" $INSTALL_ROOTDIR cp "$CURRENTDIR/$megaglest_linux_path/makedeps_folder.sh" $INSTALL_ROOTDIR
@ -191,7 +190,7 @@ if [ $REPACKONLY -eq 0 ]; then
# Copy shared lib dependencies for megaglest # Copy shared lib dependencies for megaglest
cd data cd data
copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh bin/megaglest" copyGlestDeptsCmd="${INSTALL_ROOTDIR}makedeps_folder.sh megaglest"
$copyGlestDeptsCmd $copyGlestDeptsCmd
cd .. cd ..
fi fi

View File

@ -178,5 +178,5 @@ findMissingSO "$LDCONFIG" "$GAMEDIR/$LIBDIR/${ICUUC_LINKEDLIBNAME}" "$ICUUC_LIBL
# rm -r techs/megapack/factions/norsemen/upgrades/training_field # rm -r techs/megapack/factions/norsemen/upgrades/training_field
#fi #fi
./bin/megaglest $@ ./megaglest $@
# ./bin/megaglest $@ 2>&1 | tee -a /tmp/`date +"%F_%k-%M-%S"`.glest.log 2>&1 # ./megaglest $@ 2>&1 | tee -a /tmp/`date +"%F_%k-%M-%S"`.glest.log 2>&1