diff --git a/.gitignore b/.gitignore index e48f6e831..13d310bb7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,42 +4,60 @@ # Gimp *.xcf # Vim -*.un~ Session.vim # KDevelop *.kdev4 # Meld *.orig +# Emacs +\#*\# +.\# -## OSX +## macOS +*.DS_Store Icon ## Windows *.old # Windows image file caches -Thumbs.db -thumbs.db -ehthumbs.db +[tT]humbs.db +ehthumbs*.db # Folder config file Desktop.ini # Recycle Bin used on file shares $RECYCLE.BIN/ +# Dump file +*.stackdump # Visual studio *.suo *.ncb +## Temp files +*.tmp +*.swp +*.bak +*.backup +*.save +*.autosav +*.autosave + ## Packages # it's better to unpack these files and commit the raw source git has its own built in compression methods *.7z +*.deb +*.rpm *.dmg *.gz +*.tgz *.iso *.jar *.rar *.tar *.zip *.bz2 +*.tbz2 *.tar.xz +*.txz ## Logs and databases *.log @@ -52,12 +70,24 @@ $RECYCLE.BIN/ !.gitattributes !.gitmodules -!.travis-before_install.sh - ## Repo +!/.travis.yml +!/.travis-before_install.sh +!/.editorconfig *.blend *.blend1 +/[bB]uild*/ +/[rR]elease*/ +/[dD]ebug*/ +/dbg*/ # breakpad symlink / directory /google-breakpad /google-breakpad/ + +# Windows_build +*.dll +*.exe +*.msi +*.pdb +# diff --git a/.travis.yml b/.travis.yml index 992a8f85c..ba8550d2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ matrix: - os: linux compiler: gcc env: Tr_Compiler_Version="default" + dist: trusty - os: linux compiler: clang env: Tr_Compiler_Version="3.9" diff --git a/data/glest_game b/data/glest_game index 7385926ed..6d34443ce 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 7385926ed8f36bcafb876ca4b61a413fe9ae8e40 +Subproject commit 6d34443cef0afaf3db6b0ac677205e96475620a7 diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh index b86b67655..42929145a 100755 --- a/mk/linux/setupBuildDeps.sh +++ b/mk/linux/setupBuildDeps.sh @@ -116,16 +116,17 @@ packages_for_next_debian_ubuntu_mint="build-essential cmake libcurl4-gnutls-dev case $distribution in Debian) case $release in - oldstable|7|7.*) - #name > wheezy, EoL May 2018 - 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" - ;; - stable|8|8.*) + oldstable|8|8.*) #name > jessie, EoL May 2020 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" ;; - testing|unstable|9|9.0) - #name > stretch / sid + stable|9|9.*) + #name > stretch, EoL ? May 2022 + 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 libidn2-0-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev" + ;; + testing|unstable|10|10.0|11|11.0) + #name > buster / sid + #numbers for testing ...and for "next testing" too installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint" ;; *) @@ -137,15 +138,11 @@ case $distribution in Ubuntu) case $release in - 12.04.2|12.04.3|12.04.4|14.04.2|14.04.3|14.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_currently_this_OS="release" ;; - 12.04*) - #LTS, name > precise, EoL April 2017 - 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" - ;; 14.04*) #LTS, name > trusty, EoL April 2019 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" @@ -154,12 +151,8 @@ case $distribution in #LTS, name > xenial, EoL April 2021 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" ;; - 16.10) - #name > yakkety, EoL July 2017 - 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" - ;; 17.04) - #name > zesty, EoL July 2017 + #name > zesty, EoL January 2018 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" ;; *) @@ -175,10 +168,6 @@ case $distribution in #LMDE 2, related with Debian ~ 8/jessie 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" ;; - 13|13.*) - #LTS, based on Ubuntu 12.04, EoL April 2017 - 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" - ;; 17|17.*) #LTS, based on Ubuntu 14.04, EoL April 2019 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" @@ -196,10 +185,6 @@ case $distribution in SuSE|SUSE?LINUX|Opensuse*|openSUSE*) case $release in - 42.1) - #EoL May 2017 - installcommand="zypper install $ZYPPER_OPTIONS 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="zypper install $ZYPPER_OPTIONS 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_currently_this_OS="release" diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index afb03c16e..e871a075d 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -398,16 +398,18 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST unsigned int low = 0; irc_get_version(&high,&low); if( (high == 1 && low >= 6) || (high > 1)) { + throw 1; + } + else { return 0; } - throw 1; }" - HAS_LIBIRCCLIENT_1_6) + LIBIRCCLIENT_VERSION_PRE_1_6) + # ^ This test doesn't work, some general problem with irc_get_version - IF(HAS_LIBIRCCLIENT_1_6) - message(STATUS "Found HAS_LIBIRCCLIENT_1_6: ${HAS_LIBIRCCLIENT_1_6}") - ELSE() - ADD_DEFINITIONS(-DLIBIRCCLIENT_PRE1_6) + IF(LIBIRCCLIENT_VERSION_PRE_1_6) + message(STATUS "Found LIBIRCCLIENT_VERSION_PRE_1_6: ${LIBIRCCLIENT_VERSION_PRE_1_6}") + ADD_DEFINITIONS(-DLIBIRCCLIENT_PRE1_6) ENDIF() else() message(STATUS "****WARNING DISABLING libircclient!!")