diff --git a/mk/cmake/Modules/FindIrcclient.cmake b/mk/cmake/Modules/FindIrcclient.cmake index 4644a7c6..7559e127 100644 --- a/mk/cmake/Modules/FindIrcclient.cmake +++ b/mk/cmake/Modules/FindIrcclient.cmake @@ -46,7 +46,9 @@ OPTION(FORCE_IRCCLIENT_DYNAMIC_LIBS "force the use of dynamic libs for IRCCLIENT MESSAGE(STATUS "Force IRCCLient dynamic: ${FORCE_IRCCLIENT_DYNAMIC_LIBS}") IF(WANT_STATIC_LIBS AND NOT FORCE_IRCCLIENT_DYNAMIC_LIBS) - SET(IRCCLIENT_FIND_LIBRARIES libircclient.a) + SET(IRCCLIENT_FIND_LIBRARIES libircclient.a ircclient.a) +ELSE() + SET(IRCCLIENT_FIND_LIBRARIES libircclient ircclient) ENDIF() FIND_LIBRARY(IRCCLIENT_LIBRARY diff --git a/mk/linux/build-mg.sh b/mk/linux/build-mg.sh index f785c43f..cd85c5c6 100755 --- a/mk/linux/build-mg.sh +++ b/mk/linux/build-mg.sh @@ -140,6 +140,16 @@ echo ' [ '"$distribution"' ] [ '"$release"' ] [ '"$codename"' ] [ '"$architectur case $distribution in + Debian) + 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" + ;; + esac + ;; + SuSE|SUSE?LINUX|Opensuse) case $release in *) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index a9443b47..9a4c7c9d 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -17,10 +17,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST INCLUDE (CheckIncludeFiles) -#Game options -option(ENABLE_FRIBIDI "Enable FriBIDi support" ON) -option(FORCE_LUA_5_1 "Force looking for LUA 5.1" OFF) -option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF) + #Game options + option(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) + option(ENABLE_FRIBIDI "Enable FriBIDi support" ON) + option(FORCE_LUA_5_1 "Force looking for LUA 5.1" OFF) + option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF) IF(WIN32) SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} @@ -115,10 +116,14 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS}) ENDIF() - OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF) - IF(WANT_STATIC_LIBS) - SET(JPEG_NAMES libjpeg.a ${JPEG_NAMES}) + OPTION(JPEG_STATIC "Set to ON to link your project with static library (instead of DLL)." ON) + OPTION(PNG_STATIC "Set to ON to link your project with static library (instead of DLL)." ON) + ENDIF() + IF(JPEG_STATIC) + SET(JPEG_NAMES libjpeg.a ${JPEG_NAMES}) + ELSE() + SET(JPEG_NAMES libjpeg ${JPEG_NAMES}) ENDIF() FIND_PACKAGE(JPEG REQUIRED) @@ -127,8 +132,10 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${JPEG_LIBRARY}) ENDIF() - IF(WANT_STATIC_LIBS) - SET(PNG_NAMES libpng.a ${PNG_NAMES}) + IF(PNG_STATIC) + SET(PNG_NAMES libpng.a ${PNG_NAMES}) + ELSE() + SET(PNG_NAMES libpng ${PNG_NAMES}) ENDIF() FIND_PACKAGE(PNG REQUIRED) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})