Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 21, 2011, 3:47:04 AM (13 years ago)
Author:
rgrieder
Message:

Renamed Lua library to "Lua5.1" because that's also what the official Linux repositories call it to differentiate it from Lua v5.0.
Also simplified the CMake find script a lot since it doesn't have to find both Lua versions anymore.

Location:
code/branches/kicklib/src
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/kicklib/src/CMakeLists.txt

    r7941 r7944  
    3939ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)
    4040#ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
    41 ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA_DYNAMIC)
     41ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA5.1_DYNAMIC)
    4242ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
    4343# If no defines are specified, these libs get linked dynamically
    … …  
    7878  ${VORBIS_INCLUDE_DIR}
    7979  ${OGG_INCLUDE_DIR}
    80   ${LUA_INCLUDE_DIR}
     80  ${LUA5.1_INCLUDE_DIR}
    8181  ${TCL_INCLUDE_PATH}
    8282  ${DIRECTX_INCLUDE_DIR}

  • code/branches/kicklib/src/external/tolua/CMakeLists.txt

    r7941 r7944  
    2626  NO_INSTALL
    2727  LINK_LIBRARIES
    28     ${LUA_LIBRARIES}
     28    ${LUA5.1_LIBRARY}
    2929  SOURCE_FILES
    3030    tolua.c
    … …  
    3232
    3333# Set some variables to the cache in order to use them in the TOLUA macro
    34 SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua" CACHE INTERNAL "")
     34SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua" CACHE INTERNAL "")
    3535SET(TOLUA_PARSER_DEPENDENCIES
    3636  toluaapp_orxonox
    37   ${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua
     37  ${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua
    3838  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
    3939  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat.lua

  • code/branches/kicklib/src/libraries/core/CMakeLists.txt

    r7941 r7944  
    9494    ${CEGUILUA_LIBRARY}
    9595    ${CEGUI_TOLUA_LIBRARY}
    96     ${LUA_LIBRARIES}
     96    ${LUA5.1_LIBRARY}
    9797    cpptcl_orxonox
    9898    ogreceguirenderer_orxonox
Note: See TracChangeset for help on using the changeset viewer.