Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 303


Ignore:
Timestamp:
Nov 28, 2007, 9:13:34 AM (17 years ago)
Author:
nicolasc
Message:

minor fixes
add FindODE.cmake (if needed)

Location:
code/branches/merger
Files:
1 added
3 edited

Legend:

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

    r301 r303  
    2626        MESSAGE("ERROR: uname terminated unclean.")
    2727  ENDIF (NOT "${UNAME_RV}" STREQUAL "0")
    28   # check wheter we are on a tardis machine
     28# check wheter we are on a tardis INCLUDEmachine
    2929  IF ("${UNAME_OV}" MATCHES "tardis")
    3030    SET (IS_TARDIS "tardis")
  • code/branches/merger/src/CMakeLists.txt

    r302 r303  
    44ADD_SUBDIRECTORY(loader)
    55ADD_SUBDIRECTORY(network)
    6 # ADD_SUBDIRECTORY(hud)
    7 # ADD_SUBDIRECTORY(weapon)
    86ADD_SUBDIRECTORY(class_hierarchy)
    97
    10 
    11 # create a few variables to simplify life
    12 # SET( ORXONOX_SRC
    13 #       inertial_node.cc
    14 #       main.cc
    15 #       ogre_control.cc
    16 #       orxonox.cc
    17 #       orxonox_scene.cc
    18 #       orxonox_ship.cc
    19 #       run_manager.cc
    20 # )
    21 
    22 #Creates an executable
    23 # ADD_EXECUTABLE(../bin/main ${ORXONOX_SRC} )
    24 
    25 #add weapon source dir
    26 
    27 # ADD_SUBDIRECTORY(hud)
    28 
    29 #Links the executable against OGRE and OIS
    30 # TARGET_LINK_LIBRARIES(../bin/main
    31 #       WEAPON
    32 #       CLASS_HIERARCHY
    33 #       HUD
    34 #       ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES}
    35 # )
    36 
    37 #TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
    38 
  • code/branches/merger/src/orxonox/CMakeLists.txt

    r302 r303  
    33SET(SRC_FILES orxonox.cc)
    44SET(INC_FILES)
    5 
    65
    76ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
Note: See TracChangeset for help on using the changeset viewer.