Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
This commit is contained in:
SoftCoder
commit
4818612404
|
|
@ -22,12 +22,13 @@ sync_support_libs(){
|
|||
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=""
|
||||
local keep_deps="libcurl libgnu libgcrypt libnghttp libidn librtmp libssh libnettle libicu liblua libjpeg libpng libvorbis libogg libircclient libminiupnpc libwx_ libGLEW libftgl libfreetype libvlc libopenal libSDL2-"
|
||||
local keep_deps="libcurl libgnu libgcrypt libnghttp libidn libpsl libunistring librtmp libssh libnettle libicu liblua libjpeg libpng libvorbis libogg libircclient libminiupnpc libwx_ libGLEW libftgl libfreetype libvlc libopenal libSDL2-"
|
||||
# libwx_ - recommended to keep always just because API/ABI compatibility, huge impact for map editor
|
||||
# libGLEW - most likely safe to keep embedded everywhere, its version matters with tools
|
||||
# libopenal - safe to keep but if any version is available locally then should be replaced
|
||||
# libSDL2 - safe to keep on .deb family only and even there, if any version is available locally then should be replaced
|
||||
# liblber & libldap_r - aren't safe to keep, very nasty secondary dependencies
|
||||
# libunistring - is it enough popular to not be necessary there? not sure
|
||||
|
||||
local scan_via_skiplist=1
|
||||
|
||||
|
|
|
|||
|
|
@ -4,18 +4,24 @@
|
|||
# ----------------------------------------------------------------------------
|
||||
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
|
||||
# Rewritten by Tom Reynolds <tomreyn@megaglest.org>
|
||||
# Copyright (c) 2012-2016 Mark Vejvoda, Tom Reynolds under GNU GPL v3.0
|
||||
# Copyright (c) 2012-2017 Mark Vejvoda, Tom Reynolds under GNU GPL v3.0
|
||||
LANG=C
|
||||
|
||||
SCRIPTDIR="$(dirname "$(readlink -f "$0")")"
|
||||
|
||||
# If you wanna only see the BuildDeps then launch script like that: './setupBuildDeps.sh --manually'.
|
||||
# If you wanna see the BuildDeps for other linux distribution (mentioned in this script) then e.g.
|
||||
# './setupBuildDeps.sh --manually "Debian"' is for you.
|
||||
# If you wanna see the BuildDeps for other linux distribution (mentioned in this script) and for
|
||||
# specific release (mentioned in this script) then e.g.
|
||||
# './setupBuildDeps.sh --manually "Debian" "stable"' is for you.
|
||||
|
||||
# Load shared functions
|
||||
. $SCRIPTDIR/mg_shared.sh
|
||||
|
||||
# Got root?
|
||||
if [ `id -u`'x' != '0x' ]
|
||||
then
|
||||
echo 'This script must be run as root (UID 0).' >&2
|
||||
if [ `id -u`'x' != '0x' ] && [ "$1" != "--manually" ]; then
|
||||
echo 'This script should be run as root (UID 0).' >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -25,26 +31,33 @@ else
|
|||
gitcommit="- 'git' tool not available -"
|
||||
fi
|
||||
|
||||
# Allow for quiet/silent installs
|
||||
if [ $1'x' = '-qx' -o $1'x' = '--quietx' -o $1'x' = '--silentx' ]
|
||||
then
|
||||
quiet=1
|
||||
else
|
||||
quiet=0
|
||||
fi
|
||||
|
||||
# Included from shared functions
|
||||
detect_system
|
||||
|
||||
echo 'We have detected the following system:'
|
||||
echo ' [ '"$distribution"' ] [ '"$release"' ] [ '"$codename"' ] [ '"$architecture"' ]'
|
||||
echo ''
|
||||
echo 'On supported systems, we will now install build dependencies.'
|
||||
echo ''
|
||||
# Allow for quiet/silent installs or manual installation
|
||||
if [ "$1" = "-q" ] || [ "$1" = "--quiet" ] || [ "$1" = "--silent" ]; then
|
||||
quiet=1; manual_install=0
|
||||
elif [ "$1" = "--manually" ]; then
|
||||
quiet=0; manual_install=1
|
||||
if [ "$2" != "" ]; then
|
||||
distribution="$2"; codename="-"; lsb="-"
|
||||
if [ "$3" != "" ]; then release="$3"; else release="-"; fi
|
||||
fi
|
||||
else
|
||||
quiet=0; manual_install=0
|
||||
fi
|
||||
|
||||
if [ "$manual_install" = "0" ]; then
|
||||
echo 'We have detected the following system:'
|
||||
echo ' [ '"$distribution"' ] [ '"$release"' ] [ '"$codename"' ] [ '"$architecture"' ]'
|
||||
echo; echo 'On supported systems, we will now install build dependencies.'; echo
|
||||
fi
|
||||
|
||||
common_info() {
|
||||
echo ''
|
||||
echo 'Please report a bug at http://bugs.megaglest.org providing the following information:'
|
||||
echo
|
||||
if [ "$1" != "no_install" ]; then
|
||||
echo 'Please report a bug at http://bugs.megaglest.org providing the following information:'
|
||||
fi
|
||||
echo '--- snip ---'
|
||||
echo 'Git revision: '"$gitcommit"
|
||||
echo 'LSB support: '"$lsb"
|
||||
|
|
@ -53,11 +66,12 @@ common_info() {
|
|||
echo 'Codename: '"$codename"
|
||||
echo 'Architecture: '"$architecture"
|
||||
echo '--- snip ---'
|
||||
echo ''
|
||||
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 'If you can come up with something which works for you, please report back to us, too. Thanks!'
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
unsupported_distribution () {
|
||||
|
|
@ -67,16 +81,26 @@ unsupported_distribution () {
|
|||
unsupported_release () {
|
||||
echo 'Unsupported '"$distribution"' release.' >&2
|
||||
common_info
|
||||
if [ "$installcommand" != '' ]
|
||||
then
|
||||
echo 'For now, please try this (which works with other '"$distribution"' releases) and report back how it works for you:'
|
||||
echo $installcommand
|
||||
if [ "$installcommand" != '' ]; then
|
||||
echo 'For now, please try this (which works with other '"$distribution"' releases) and report back how it works for you:'; echo
|
||||
echo "$installcommand"; echo
|
||||
echo 'Thanks!'
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
error_during_installation () {
|
||||
echo 'An error occurred while installing build dependencies.' >&2
|
||||
common_info +wiki
|
||||
install_command () {
|
||||
if [ "$installcommand" = '' ]; then echo 'Error detected: Empty install command!' >&2; exit 1; fi
|
||||
if [ "$manual_install" = "1" ]; then
|
||||
echo 'Proposed command to use:'; echo
|
||||
echo "$installcommand"
|
||||
common_info no_install
|
||||
else
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then
|
||||
echo 'An error occurred while installing build dependencies.' >&2
|
||||
common_info +wiki
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$quiet" -eq "1" ]; then
|
||||
|
|
@ -86,29 +110,23 @@ if [ "$quiet" -eq "1" ]; then
|
|||
DNF_OPTIONS="$DNF_OPTIONS -y -q"
|
||||
fi
|
||||
|
||||
packages_for_next_debian_ubuntu_mint="build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev"
|
||||
packages_for_next_debian_ubuntu_mint="build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn2-0-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev"
|
||||
|
||||
case $distribution in
|
||||
Debian)
|
||||
case $release in
|
||||
oldstable|7|7.*)
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libminiupnpc-dev librtmp-dev libgtk2.0-dev libcppunit-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
stable|8|8.*)
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.2-dev libjpeg-dev libpng12-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls28-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
testing|unstable|9|9.0)
|
||||
installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
*)
|
||||
installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint"
|
||||
unsupported_release; exit 1
|
||||
unsupported_currently_this_OS="release"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -118,37 +136,27 @@ case $distribution in
|
|||
12.04.2|12.04.3|12.04.4|14.04.2|14.04.3|14.04.4)
|
||||
# "not so LTS" are those LTS v xD
|
||||
installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint"
|
||||
unsupported_release
|
||||
exit 1
|
||||
unsupported_currently_this_OS="release"
|
||||
;;
|
||||
12.04*)
|
||||
#LTS, name > precise
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
14.04*)
|
||||
#LTS, name > trusty
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxgtk3.0-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libvlccore-dev libcppunit-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
16.04*)
|
||||
#LTS, name > xenial
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng12-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
16.10)
|
||||
#name > yakkety
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
*)
|
||||
installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint"
|
||||
unsupported_release
|
||||
exit 1
|
||||
unsupported_currently_this_OS="release"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -158,25 +166,18 @@ case $distribution in
|
|||
13|13.*)
|
||||
#LTS, based on Ubuntu 12.04
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxbase2.8-dev libwxgtk2.8-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libcppunit-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
17|17.*)
|
||||
#LTS, based on Ubuntu 14.04
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl2-dev libalut-dev libgl1-mesa-dev libglu1-mesa-dev libvorbis-dev libwxgtk3.0-dev libx11-dev liblua5.1-0-dev libjpeg-dev libpng12-dev libcurl4-gnutls-dev libxml2-dev libircclient-dev libglew-dev libftgl-dev libfribidi-dev libvlc-dev libvlccore-dev libcppunit-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
18|18.*)
|
||||
#LTS, based on Ubuntu 16.04
|
||||
installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng12-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
*)
|
||||
installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint"
|
||||
unsupported_release
|
||||
exit 1
|
||||
unsupported_currently_this_OS="release"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -185,13 +186,10 @@ case $distribution in
|
|||
case $release in
|
||||
42.1)
|
||||
installcommand="zypper install gcc gcc-c++ cmake libSDL2-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxWidgets-devel lua-devel libjpeg8-devel libpng16-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel libminiupnpc-devel vlc-devel"
|
||||
$installcommand
|
||||
if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi
|
||||
;;
|
||||
*)
|
||||
installcommand="zypper install gcc gcc-c++ cmake libSDL2-devel Mesa-libGL-devel freeglut-devel libvorbis-devel wxWidgets-devel lua-devel libjpeg8-devel libpng16-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel libminiupnpc-devel vlc-devel"
|
||||
unsupported_release
|
||||
exit 1
|
||||
unsupported_currently_this_OS="release"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -200,8 +198,7 @@ case $distribution in
|
|||
case $release in
|
||||
*)
|
||||
installcommand="dnf $DNF_OPTIONS install gcc gcc-c++ redhat-rpm-config cmake SDL2-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel libxml2-devel libircclient-devel glew-devel ftgl-devel fribidi-devel cppunit-devel miniupnpc-devel"
|
||||
unsupported_release
|
||||
exit 1
|
||||
unsupported_currently_this_OS="release"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -212,8 +209,7 @@ case $distribution in
|
|||
case $release in
|
||||
*)
|
||||
installcommand="urpmi $URPMI_OPTIONS gcc gcc-c++ cmake make ${lib}curl-devel ${lib}sdl2.0-devel ${lib}openal-devel ${lib}lua${static}-devel ${lib}jpeg${static}-devel ${lib}png-devel ${lib}freetype6${static}-devel ${lib}wxgtku3.0-devel ${lib}cppunit-devel ${lib}fribidi${static}-devel ${lib}ftgl-devel ${lib}glew-devel ${lib}ogg${static}-devel ${lib}vorbis-devel ${lib}miniupnpc-devel ${lib}ircclient-static-devel ${lib}vlc-devel ${lib}xml2-devel ${lib}x11-devel ${lib}mesagl1-devel ${lib}mesaglu1-devel ${lib}openssl${static}-devel"
|
||||
unsupported_release
|
||||
exit 1
|
||||
unsupported_currently_this_OS="release"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -223,16 +219,17 @@ case $distribution in
|
|||
case $release in
|
||||
*)
|
||||
installcommand="pacman $PACMAN_OPTIONS -S --needed gcc-multilib cmake ${lib}libcurl-gnutls ${lib}sdl2 ${lib}openal lua ${lib}libjpeg-turbo ${lib}libpng ${lib}freetype2 ${lib}wxgtk cppunit fribidi ftgl ${lib}glew ${lib}libogg ${lib}libvorbis miniupnpc libircclient vlc ${lib}libxml2 ${lib}libx11 ${lib}mesa ${lib}glu"
|
||||
unsupported_release
|
||||
exit 1
|
||||
unsupported_currently_this_OS="release"
|
||||
esac
|
||||
;;
|
||||
|
||||
*)
|
||||
unsupported_distribution
|
||||
exit 1
|
||||
unsupported_currently_this_OS="distribution"
|
||||
;;
|
||||
esac
|
||||
|
||||
echo ''
|
||||
echo 'Installation of build dependencies complete.'
|
||||
if [ "$unsupported_currently_this_OS" = "release" ]; then unsupported_release
|
||||
elif [ "$unsupported_currently_this_OS" = "distribution" ]; then unsupported_distribution
|
||||
else install_command; fi
|
||||
if [ "$manual_install" = "0" ]; then
|
||||
echo; echo 'Installation of build dependencies complete.'
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ MainWindow::MainWindow( std::pair<string,vector<string> > unitToLoad,
|
|||
auto_ptr<wchar_t> wstr(Ansi2WideString(appPath.c_str()));
|
||||
|
||||
wstring launchApp = wstring(wstr.get()) + L" \"%1\"";
|
||||
DWORD len = (DWORD)launchApp.length() + 1;
|
||||
DWORD len = (launchApp.size() + 1) * sizeof(wchar_t);
|
||||
RegSetValueEx(keyHandle, NULL, 0, REG_SZ, (PBYTE)launchApp.c_str(), len);
|
||||
RegCloseKey(keyHandle);
|
||||
|
||||
|
|
@ -463,7 +463,7 @@ MainWindow::MainWindow( std::pair<string,vector<string> > unitToLoad,
|
|||
RegCreateKeyEx(HKEY_CURRENT_USER,subKey.c_str(),0, NULL, 0, KEY_ALL_ACCESS, NULL, &keyHandle, &dwDisposition);
|
||||
//Set the value.
|
||||
launchApp = L"megaglest.g3d";
|
||||
len = (DWORD)launchApp.length() + 1;
|
||||
len = (launchApp.size() + 1) * sizeof(wchar_t);
|
||||
RegSetValueEx(keyHandle, NULL, 0, REG_SZ, (PBYTE)launchApp.c_str(), len);
|
||||
RegCloseKey(keyHandle);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue