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

View File

@@ -36,8 +36,8 @@ include (InstallRequiredSystemLibraries)
# Use bundle generator (OSX has 3 other options if you feel adventurous)
SET(CPACK_GENERATOR "Bundle")
SET(CPACK_BUNDLE_NAME "MegaGlest")
SET(CPACK_PACKAGE_FILE_NAME "MegaGlest-game-macos-${ZETAGLEST_VERSION}")
SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns")
SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns")
SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.sh")
SET(CPACK_BUNDLE_NAME "ZetaGlest")
SET(CPACK_PACKAGE_FILE_NAME "ZetaGlest-game-macos-${ZETAGLEST_VERSION}")
SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.icns")
SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.icns")
SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/ZetaGlest.sh")

View File

@@ -84,7 +84,7 @@ cd ${SCRIPTDIR}
if [ "$BUILD_BUNDLE" -eq "1" ] && [ -d "p7zip" ]; then rm -rf "p7zip"; fi
if [ -e ".p7zip.zip" ] && [ "$(find ./ -name ".p7zip.zip" -mtime +90)" ]; then rm ".p7zip.zip"; rm -rf "p7zip"; fi
if [ ! -e ".p7zip.zip" ]; then
curl -L -o .p7zip.zip https://github.com/MegaGlest/zetaglest-source/releases/download/3.3.0/p7zip.zip 2>/dev/null
curl -L -o .p7zip.zip https://github.com/MegaGlest/megaglest-source/releases/download/3.3.0/p7zip.zip 2>/dev/null
# ^sha256: 20ac3b0377054f8196c10e569bd6ec7c6ed06d519fa39e781ee6d27d7887588b
if [ -e ".p7zip.zip" ]; then touch -m ".p7zip.zip"; fi
fi
@@ -213,7 +213,7 @@ if [ "$MAKE_ONLY" -eq "0" ]; then
else
rm -f ../zetaglest_tests
fi
rm -f ../MegaGlest*.dmg
rm -f ../ZetaGlest*.dmg
else
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DCPACK_GENERATOR=Bundle -DWANT_SINGLE_INSTALL_DIRECTORY=ON"
rm -f ../zetaglest_editor ../zetaglest_g3dviewer ../zetaglest_tests
@@ -261,7 +261,7 @@ else
otool -L zetaglest
echo '- - - - - - - - - - - - - - - - - - - -'
echo ''
echo 'To launch MegaGlest from the current directory, use:'
echo 'To launch ZetaGlest from the current directory, use:'
echo ' ./zetaglest'
echo ''
else

View File

@@ -5,17 +5,17 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>MegaGlest</string>
<string>ZetaGlest</string>
<key>CFBundleGetInfoString</key>
<string>v${ZETAGLEST_VERSION}, © 2018 The ZetaGlest Team.</string>
<key>CFBundleIconFile</key>
<string>MegaGlest</string>
<string>ZetaGlest</string>
<key>CFBundleIdentifier</key>
<string>org.megaglest.v${ZETAGLEST_VERSION}</string>
<string>org.zetaglest.v${ZETAGLEST_VERSION}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>MegaGlest</string>
<string>ZetaGlest</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>

View File

@@ -10,9 +10,9 @@ if [ -d "$SCRIPTDIR/lib" ]; then
binary_dir_path="$SCRIPTDIR"
else
export DYLD_LIBRARY_PATH="$SCRIPTDIR/../Frameworks"
binary_dir_path="$SCRIPTDIR/../Resources/megaglest-game"
binary_dir_path="$SCRIPTDIR/../Resources/zetaglest-game"
fi
export PATH="$binary_dir_path:$PATH"
exec "$binary_dir_path/megaglest" "$@"
exec "$binary_dir_path/zetaglest" "$@"
exit "$?"