From 34d52e40d75a5d219fde9e2fa3dc1e22f6feaadb Mon Sep 17 00:00:00 2001 From: filux Date: Wed, 29 Apr 2015 20:23:03 +0200 Subject: [PATCH] updated support for new versions of ubuntu --- mk/linux/build-mg.sh | 35 ++++++++++++++++---- mk/linux/setupBuildDeps.sh | 57 +++++++++++++------------------- source/shared_lib/CMakeLists.txt | 19 +++++++---- 3 files changed, 63 insertions(+), 48 deletions(-) diff --git a/mk/linux/build-mg.sh b/mk/linux/build-mg.sh index cd85c5c62..44d2f6091 100755 --- a/mk/linux/build-mg.sh +++ b/mk/linux/build-mg.sh @@ -144,13 +144,33 @@ case $distribution in case $release in 6.*|7.*) ;; *) - echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG, IRCCLIENT ...' - EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFTGL_STATIC=OFF -DLUA_STATIC=OFF -DJPEG_STATIC=OFF -DPNG_STATIC=OFF -DFORCE_IRCCLIENT_DYNAMIC_LIBS=ON" + echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT' + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFTGL_STATIC=OFF -DLUA_STATIC=OFF -DJPEG_STATIC=OFF -DPNG_STATIC=OFF -DFORCE_USE_EMBEDDED_IRCCLIENT=ON" ;; esac ;; - SuSE|SUSE?LINUX|Opensuse) + Ubuntu) + case $release in + 10.*|11.*|12.*|13.*|14.*) ;; + *) + echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT' + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFTGL_STATIC=OFF -DLUA_STATIC=OFF -DJPEG_STATIC=OFF -DPNG_STATIC=OFF -DFORCE_USE_EMBEDDED_IRCCLIENT=ON" + ;; + esac + ;; + + LinuxMint) + case $release in + 13|13.*|14|15|16|17|17.*) ;; + *) + echo 'Turning ON dynamic FTGL, LUA, JPEG, PNG ... and forcing use the embedded IRCCLIENT' + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DFTGL_STATIC=OFF -DLUA_STATIC=OFF -DJPEG_STATIC=OFF -DPNG_STATIC=OFF -DFORCE_USE_EMBEDDED_IRCCLIENT=ON" + ;; + esac + ;; + + SuSE|SUSE?LINUX|Opensuse) case $release in *) echo 'Turning ON dynamic CURL ...' @@ -159,7 +179,7 @@ case $distribution in esac ;; - Fedora) + Fedora) case $release in *) echo 'Turning ON dynamic CURL ...' @@ -167,10 +187,11 @@ case $distribution in ;; esac ;; + Arch) - echo 'Turning ON dynamic LIBS ...' - EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DWANT_STATIC_LIBS=OFF" - ;; + echo 'Turning ON dynamic LIBS ...' + EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DWANT_STATIC_LIBS=OFF" + ;; esac #exit 1; diff --git a/mk/linux/setupBuildDeps.sh b/mk/linux/setupBuildDeps.sh index c30b70d3d..1f927e6da 100755 --- a/mk/linux/setupBuildDeps.sh +++ b/mk/linux/setupBuildDeps.sh @@ -110,32 +110,29 @@ if [ "$quiet" -eq "1" ]; then APT_OPTIONS="$APT_OPTIONS -y -q" URPMI_OPTIONS="$URPMI_OPTIONS -q --auto" fi + +packages_for_next_debian_ubuntu_mint="build-essential cmake libcurl4-gnutls-dev libsdl1.2-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" + case $distribution in Debian) case $release in - oldstable|6|6.*) - # 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 - installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-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; - echo '' - echo 'Be sure to have the squeeze-backports repository installed, it is required for libminiupnpc-dev.' - exit 1; - fi - ;; - stable|7|7.*) + oldstable|7|7.*) installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-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 ;; - testing|unstable|8|8.0|9|9.0) - installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-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 libgnutls-dev" + stable|8|8.*) + installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-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 build-essential cmake libcurl4-gnutls-dev libsdl1.2-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 libgnutls-dev" + installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint" unsupported_release; exit 1 ;; esac @@ -143,25 +140,25 @@ case $distribution in Ubuntu) case $release in - 10.04) - #LTS - installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-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 libglew1.5-dev libftgl-dev libfribidi-dev libcppunit-dev" - $installcommand - if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi - ;; - 12.04|14.04) + 12.04*) #LTS installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-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 ;; - 14.10) - installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-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 libgnutls-dev" + 14.04*) + #LTS + installcommand="apt-get install $APT_OPTIONS build-essential cmake libsdl1.2-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 + ;; + 14.10|15.04) + installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-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 ;; *) - installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-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 libgnutls-dev" + installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint" unsupported_release exit 1 ;; @@ -177,7 +174,7 @@ case $distribution in if [ "$?" -ne "0" ]; then error_during_installation; exit 1; fi ;; *) - installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl1.2-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 libgnutls-dev" + installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint" unsupported_release exit 1 ;; @@ -246,14 +243,6 @@ case $distribution in esac ;; -# Redhat) -# -# ;; -# -# Mandrake|Mandriva) -# -# ;; - *) unsupported_distribution exit 1 diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index 9a4c7c9da..3da563e02 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -349,17 +349,22 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}xml/rapidxml ) INCLUDE_DIRECTORIES("sources/") - option(DISABLE_IRCCLIENT "Disable libircclient support" OFF) + option(DISABLE_IRCCLIENT "Disable libircclient support" OFF) + option(FORCE_USE_EMBEDDED_IRCCLIENT "Use embedded to source code version of ircclient" OFF) IF(NOT DISABLE_IRCCLIENT) #IF(NOT WANT_STATIC_LIBS) - MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is: ${WANT_STATIC_LIBS} ...") - FIND_PACKAGE(Ircclient) - #ENDIF() - - if(NOT IRCCLIENT_FOUND) - MESSAGE(STATUS "*** Using EMBEDDED libircclient since this system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]") + IF(NOT FORCE_USE_EMBEDDED_IRCCLIENT) + MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is: ${WANT_STATIC_LIBS} ...") + FIND_PACKAGE(Ircclient) + ENDIF() + if(NOT IRCCLIENT_FOUND OR FORCE_USE_EMBEDDED_IRCCLIENT) + if(NOT FORCE_USE_EMBEDDED_IRCCLIENT) + MESSAGE(STATUS "*** Using EMBEDDED libircclient since this system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]") + else() + MESSAGE(STATUS "*** Using EMBEDDED libircclient because it was forced by option 'FORCE_USE_EMBEDDED_IRCCLIENT'") + endif() SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/libircclient/src/libircclient.c) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/libircclient/include) else()