mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-20 23:21:19 +02:00
Code Issues Projects Releases Wiki Activity

- bug fixes and patches from hasufell related to:

Browse Source 
- fontconfig not working
- new cmake option to control inclusion of libvlc
- new commandline option to force where to look for fonts: --font-path=x
- removal of libluajit from cmake
This commit is contained in:
Mark Vejvoda
2012-11-14 19:20:08 +00:00
parent 53f1163ca4
commit d322f73284
7 changed files with 80 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/shared_lib/CMakeLists.txt
View File

@@ -110,23 +110,23 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
# ENDIF()
FIND_PACKAGE(LUAJIT)
IF(LUAJIT_FOUND)
MESSAGE(STATUS "**NOTE: LUAJIT found, this should improve Lua performance.")
INCLUDE_DIRECTORIES(${LUAJIT_INCLUDE_DIR})
IF(UNIX)
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUAJIT_LIBRARIES} "libdl.so")
ENDIF()
ELSE()
MESSAGE(STATUS "**WARNING: LUAJIT NOT found, so Lua performance may suffer.")
FIND_PACKAGE(LUA REQUIRED)
INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
IF(UNIX)
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUA_LIBRARIES} "libdl.so")
ENDIF()
# FIND_PACKAGE(LUAJIT)
# IF(LUAJIT_FOUND)
# MESSAGE(STATUS "**NOTE: LUAJIT found, this should improve Lua performance.")
#
# INCLUDE_DIRECTORIES(${LUAJIT_INCLUDE_DIR})
# IF(UNIX)
# SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUAJIT_LIBRARIES} "libdl.so")
# ENDIF()
# ELSE()
# MESSAGE(STATUS "**WARNING: LUAJIT NOT found, so Lua performance may suffer.")
#
FIND_PACKAGE(LUA REQUIRED)
INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
IF(UNIX)
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${LUA_LIBRARIES} "libdl.so")
ENDIF()
# ENDIF()
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
@@ -223,7 +223,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
SET(LIBVLC_MIN_VERSION "1.1.0")
FIND_PACKAGE(LIBVLC)
IF(LIBVLC_FOUND AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
IF(LIBVLC_FOUND AND WITH_VLC AND NOT LIBVLC_VERSION STRLESS "${LIBVLC_MIN_VERSION}")
MESSAGE(STATUS "**NOTE: LIBVLC found so videos are supported.")
INCLUDE_DIRECTORIES(${LIBVLC_INCLUDE_DIR})
IF(UNIX)
@@ -239,6 +239,12 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
ELSE()
MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.")
IF(WITH_VLC)
MESSAGE(STATUS "**WARNING: LIBVLC NOT found so videos are NOT supported.")
ELSE()
MESSAGE(STATUS "LIBVLC disabled so videos are NOT supported.")
ENDIF()
ENDIF()
#########################################################################################