mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 03:09:49 +02:00
Code Issues Projects Releases Wiki Activity

- fixed lua 5.2 code for save / load games

Browse Source 
- cmake now prefers lua 5.2 over 5.1
This commit is contained in:
Mark Vejvoda
2013-02-16 21:20:09 +00:00
parent 85b1365e7e
commit 87a4eb49e4
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mk/cmake/Modules/FindLUA.cmake
View File

@@ -21,6 +21,7 @@ ENDIF(LUA_INCLUDE_DIR AND LUA_LIBRARIES)
FIND_PATH(LUA_INCLUDE_DIR NAMES lua.hpp
PATHS /usr/include
/usr/include/lua
/usr/include/lua5.2
/usr/include/lua5.1
IF(FreeBSD)
SET(PATHS "/usr/local/include/lua51")
@@ -29,7 +30,7 @@ FIND_PATH(LUA_INCLUDE_DIR NAMES lua.hpp
)
IF (LUA_STATIC AND NOT LUA_LIBRARIES)
FIND_LIBRARY(LUA_LIBRARIES NAMES liblua5.1.a liblua.a lua5.1 lua
FIND_LIBRARY(LUA_LIBRARIES NAMES liblua5.2.a liblua5.1.a liblua.a lua5.1 lua
PATHS
IF(FreeBSD)
SET(PATHS "/usr/local/lib/lua51")
@@ -37,7 +38,7 @@ IF (LUA_STATIC AND NOT LUA_LIBRARIES)
$ENV{LUA_HOME})
ELSE()
FIND_LIBRARY(LUA_LIBRARIES NAMES lua5.1 lua
FIND_LIBRARY(LUA_LIBRARIES NAMES lua5.2 lua5.1 lua
PATHS
IF(FreeBSD)
SET(PATHS "/usr/local/lib/lua51")