Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 301


Ignore:
Timestamp:
Nov 28, 2007, 2:26:29 AM (17 years ago)
Author:
nicolasc
Message:

2nd tier cleanup

Location:
code/branches/merger
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/merger/CMakeLists.txt

    r300 r301  
    5151
    5252#Sets the search paths for the linking
    53 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS})
     53LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} core objects loader network weapon classHierarchy)
    5454#Sets the search path for include files
    55 INCLUDE_DIRECTORIES(src ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
     55INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
    5656
    5757#add main source dir
  • code/branches/merger/src/class_hierarchy/CMakeLists.txt

    r300 r301  
    1515   )
    1616
    17 ADD_LIBRARY(CLASS_HIERARCHY ${CLASS_HIERARCHY_SRC} )
     17ADD_LIBRARY(classHierarchy ${CLASS_HIERARCHY_SRC} )
  • code/branches/merger/src/loader/CMakeLists.txt

    r282 r301  
    55SET(INC_FILES LevelLoader.h ../xml/xmlParser.h)
    66
     7INCLUDE_DIRECTORIES(..)
     8
    79ADD_LIBRARY(loader ${SRC_FILES} ${INC_FILES})
  • code/branches/merger/src/orxonox/CMakeLists.txt

    r293 r301  
    77ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
    88
    9 TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES} ${Boost_LIBRARIES} core objects loader network)
     9TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES} ${Boost_LIBRARIES} loader)
    1010
     11INCLUDE_DIRECTORIES(..)
    1112
    1213ADD_SUBDIRECTORY(core)
  • code/branches/merger/src/weapon/CMakeLists.txt

    r300 r301  
    1111)
    1212
    13 ADD_LIBRARY(WEAPON ${WEAPON_SRC} )
     13INCLUDE_DIRECTORIES(..)
     14
     15ADD_LIBRARY(weapon ${WEAPON_SRC})
Note: See TracChangeset for help on using the changeset viewer.