Renamed files

This commit is contained in:
mathusummut
2018-11-02 20:44:56 +01:00
parent 4d9911fd38
commit 71d122d5fd
8 changed files with 22 additions and 22 deletions

View File

@@ -1,5 +1,5 @@
#!/bin/bash
# Use this script to build MegaGlest using cmake
# Use this script to build ZetaGlest using cmake
# ----------------------------------------------------------------------------
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2011-2013 Mark Vejvoda under GNU GPL v3.0+
@@ -137,7 +137,7 @@ BREAKPAD_ROOT="$SCRIPTDIR/../../google-breakpad/"
# The default configuration works fine for regular developers and is also used
# by our installers.
# For more cmake/build options refer to
# http://wiki.megaglest.org/Linux_Compiling#Building_using_CMake_by_Hand
# https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md
EXTRA_CMAKE_OPTIONS=
# Build threads
@@ -152,7 +152,7 @@ echo "CPU cores to be used: $NUMCORES"
# Load shared functions
. $SCRIPTDIR/mg_shared.sh
. $SCRIPTDIR/zg_shared.sh
# ----------------------------------------------------------------------------
@@ -347,5 +347,5 @@ else
echo 'To launch ZetaGlest from the current directory, use:'
echo ' ./zetaglest'
#echo 'Or change into mk/linux and run it from there:'
#echo ' ./megaglest --ini-path=./ --data-path=./'
#echo ' ./zetaglest --ini-path=./ --data-path=./'
fi

View File

@@ -17,7 +17,7 @@ SCRIPTDIR="$(dirname "$(readlink -f "$0")")"
# './setupBuildDeps.sh --manually "Debian" "stable"' is for you.
# Load shared functions
. $SCRIPTDIR/mg_shared.sh
. $SCRIPTDIR/zg_shared.sh
# Got root?
if [ `id -u`'x' != '0x' ] && [ "$1" != "--manually" ]; then
@@ -56,7 +56,7 @@ fi
common_info() {
echo
if [ "$1" != "no_install" ]; then
echo 'Please report a bug at http://bugs.megaglest.org providing the following information:'
echo 'Please report a bug at https://github.com/ZetaGlest/zetaglest-source providing the following information:'
fi
echo '--- snip ---'
echo 'Git revision: '"$gitcommit"
@@ -68,8 +68,8 @@ common_info() {
echo '--- snip ---'
echo
if [ "$1" = "+wiki" ]; then
echo 'For now, you may want to take a look at the build hints on the MegaGlest wiki at:'
echo ' https://docs.megaglest.org/MG/Linux_Compiling'
echo 'For now, you may want to take a look at the build hints on the ZetaGlest readme at:'
echo ' https://github.com/ZetaGlest/zetaglest-source/blob/develop/BUILD.md'
echo 'If you can come up with something which works for you, please report back to us, too. Thanks!'
exit 1
fi

0
mk/linux/mg_shared.sh → mk/linux/zg_shared.sh Executable file → Normal file
View File