Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 20, 2008, 5:53:30 PM (16 years ago)
Author:
adrfried
Message:

further cleanup

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

Legend:

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

    r1975 r1977  
    1 INCLUDE_DIRECTORIES(.)
    2 INCLUDE_DIRECTORIES(..)
    3 INCLUDE_DIRECTORIES(ois) # for ois library subfolders
    4 INCLUDE_DIRECTORIES(orxonox)
    5 #INCLUDE_DIRECTORIES(lua) # for tolua library and generator
    6 INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
     1# Set the search paths for include files
     2INCLUDE_DIRECTORIES(
     3  ${OGRE_INCLUDE_DIR}
     4  ${CEGUI_INCLUDE_DIR}
     5#  ${CEGUI_OGRE_INCLUDE_DIR}
     6  ${ENet_INCLUDE_DIR}
     7  ${Boost_INCLUDE_DIRS}
     8  ${OPENAL_INCLUDE_DIR}
     9  ${ALUT_INCLUDE_DIR}
     10  ${VORBIS_INCLUDE_DIR}
     11  ${OGG_INCLUDE_DIR}
     12  ${LUA_INCLUDE_DIR}
     13  ${TCL_INCLUDE_PATH}
     14  ${DirectX_INCLUDE_DIR}
     15  ${ZLIB_INCLUDE_DIR}
     16)
     17
     18# Set the search paths for the linking
     19LINK_DIRECTORIES(
     20  ${OGRE_LIB_DIR}
     21  ${CEGUI_LIB_DIR}
     22#  ${CEGUI_SCRIPT_LIB_DIR}
     23#  ${CEGUI_OGRE_LIB_DIR}
     24  ${ENet_LIBRARY}
     25  ${Boost_LIBRARY_DIRS}
     26  ${Zlib_LIBRARY_DIR}
     27  ${TCL_LIBRARY}
     28)
     29
     30INCLUDE_DIRECTORIES(
     31  .
     32  ..
     33  ois
     34  orxonox
     35)
    736
    837ADD_SUBDIRECTORY(cpptcl)
     
    1241ADD_SUBDIRECTORY(tolua)
    1342
     43# TODO: write include file for this stuff
    1444# Some people may not have CEGUILua installed, espc. with version 0.5
    1545# And we don't know what lua version it was linked against, so we compile
  • code/branches/buildsystem/src/core/CMakeLists.txt

    r1975 r1977  
    5959TARGET_LINK_LIBRARIES(core
    6060  ${OGRE_LIBRARIES}
    61   ${Boost_thread_LIBRARIES}
    62   ${Boost_filesystem_LIBRARIES}
     61  ${Boost_THREAD_LIBRARY}
     62  ${Boost_FILESYSTEM_LIBRARY}
    6363  ${LUA_LIBRARIES}
    6464  cpptcl_orxonox
  • code/branches/buildsystem/src/network/CMakeLists.txt

    r1740 r1977  
    2828  ${ZLIB_LIBRARY}
    2929  ${ENet_LIBRARY}
    30   ${Boost_thread_LIBRARIES}
     30  ${Boost_THREAD_LIBRARY}
    3131  core
    3232)
  • code/branches/buildsystem/src/orxonox/CMakeLists.txt

    r1975 r1977  
    9898  ${CEGUI_LIBRARIES}
    9999  ${LUA_LIBRARIES}
     100  # TODO: write include file for this
    100101  CEGUILuaScriptModule
    101102  tinyxml_orxonox
Note: See TracChangeset for help on using the changeset viewer.