diff --git a/mk/linux/servers.ini b/mk/linux/servers.ini index f51f4171..6d25fccd 100644 --- a/mk/linux/servers.ini +++ b/mk/linux/servers.ini @@ -1,4 +1,6 @@ ; === propertyMap File === -engineer1=78.47.225.60 -summoner=124.109.2.127 +Engineer1=78.47.225.60 +Engineer2=78.47.225.60:61457 +Summoner1=124.109.2.127 +This computer=127.0.0.1 diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh index 92f97b0c..11dd1205 100755 --- a/mk/linux/setupBuildDeps.sh +++ b/mk/linux/setupBuildDeps.sh @@ -158,7 +158,12 @@ case $distribution in if [ $? != 0 ]; then error_during_installation; exit 1; fi # No libvlc-dev since version (1.1.3) in Debian 6.0/Squeeze is incompatible, no libluajit-5.1-dev because it is not available on Debian 6.0/Squeeze, cf. http://glest.org/glest_board/?topic=8460 apt-get install libsdl1.2-dev libxerces-c2-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 libminiupnpc-dev librtmp-dev libgtk2.0-dev - if [ $? != 0 ]; then error_during_installation; exit 1; fi + if [ $? != 0 ]; then + error_during_installation; + echo '' + echo 'Be sure to have the squeeze-backports repository installed, it is required for libminiupnpc-dev.' + exit 1; + fi ;; *) alternative='apt-get install build-essential subversion automake autoconf autogen cmake cmake-curses-gui; apt-get install libsdl1.2-dev libxerces-c2-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 libluajit-5.1-dev libftgl-dev libminiupnpc-dev libvlc-dev librtmp-dev libgtk2.0-dev'