Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1808 for code/branches


Ignore:
Timestamp:
Sep 21, 2008, 8:30:03 PM (16 years ago)
Author:
rgrieder
Message:

Minor changes with cmake files. The whole thing compiles on tardis now

Location:
code/branches/ceguilua/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ceguilua/src/CMakeLists.txt

    r1804 r1808  
    22INCLUDE_DIRECTORIES(..)
    33INCLUDE_DIRECTORIES(orxonox)
    4 #INCLUDE_DIRECTORIES(tolua)
    54
    65ADD_SUBDIRECTORY(cpptcl)
    76ADD_SUBDIRECTORY(ois)
    87ADD_SUBDIRECTORY(tinyxml)
     8ADD_SUBDIRECTORY(lua)
     9ADD_SUBDIRECTORY(tolua)
    910
    10 # This section deals with Lua version problems because CEGUILua scripting
    11 # module for CEGUI also uses Lua, but maybe with a different version.
     11# Some people may not have CEGUILua installed, espc. with version 0.5
     12# And we don't know what lua version it was linked against, so we compile
     13# it ourselves.
    1214# So first, find out what CEGUI version we have.
     15IF (${CEGUI_VERSION} LESS 0.6.0)
     16    ADD_SUBDIRECTORY(ceguilua-0.5.0b)
     17    INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
     18ELSE (${CEGUI_VERSION} LESS 0.6.0)
     19    ADD_SUBDIRECTORY(ceguilua-0.6.1)
     20    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
     21ENDIF (${CEGUI_VERSION} LESS 0.6.0)
    1322
    1423
    15 ADD_SUBDIRECTORY(tolua)
    16 
     24# Our own libraries
    1725ADD_SUBDIRECTORY(util)
    1826ADD_SUBDIRECTORY(core)
  • code/branches/ceguilua/src/ceguilua-0.5.0b/ceguilua/CMakeLists.txt

    r1804 r1808  
    88)
    99
    10 ADD_LIBRARY( ceguilua_orxonox SHARED ${LUA_SRC_FILES} )
     10ADD_LIBRARY( ceguilua_orxonox SHARED ${CEGUILUA_SRC_FILES} )
    1111
    1212TARGET_LINK_LIBRARIES( ceguilua_orxonox lua_orxonox )
  • code/branches/ceguilua/src/core/CMakeLists.txt

    r1804 r1808  
    5454)
    5555
    56 GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
     56GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
    5757ADD_CUSTOM_COMMAND(
    5858  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
  • code/branches/ceguilua/src/orxonox/CMakeLists.txt

    r1804 r1808  
    6666)
    6767
    68 GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
     68GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
    6969ADD_CUSTOM_COMMAND(
    7070  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
     
    9898  ${OGRE_LIBRARIES}
    9999  ${CEGUI_LIBRARIES}
    100   ${CEGUI_SCRIPT_LIBRARIES}
    101100  lua_orxonox
     101  ceguilua_orxonox
    102102  tinyxml_orxonox
    103103  tolualib_orxonox
Note: See TracChangeset for help on using the changeset viewer.