Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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

initial merge of main_reto

Location:
code/branches/merger/src
Files:
2 edited
52 copied

Legend:

Unmodified
Added
Removed

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

    r293 r300  
    11PROJECT(Orxonox)
    2 
    3 # create a few variables to simplify life
    4 # SET(SRC_FILES orxonox/orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc orxonox/core/IdentifierList.cc orxonox/core/Identifier.cc orxonox/core/MetaObjectList.cc orxonox/core/Factory.cc orxonox/core/OrxonoxClass.cc orxonox/objects/BaseObject.cc orxonox/objects/test1.cc orxonox/objects/test2.cc orxonox/objects/test3.cc)
    5 # SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h orxonox/core/IdentifierIncludes.h orxonox/core/Identifier.h orxonox/core/Factory.h orxonox/core/ClassFactory.h orxonox/core/IdentifierList.h orxonox/core/ObjectList.h orxonox/core/MetaObjectList.h orxonox/core/Iterator.h orxonox/core/OrxonoxClass.h orxonox/objects/BaseObject.h orxonox/objects/Test.h orxonox/objects/test1.h orxonox/objects/test2.h orxonox/objects/test3.h)
    6 
    7 #Creates an executable
    8 # ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
    9 #Links the executable against OGRE and OIS
    10 # TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
    112
    123ADD_SUBDIRECTORY(orxonox)
    … …  
    145ADD_SUBDIRECTORY(network)
    156ADD_SUBDIRECTORY(hud)
     7ADD_SUBDIRECTORY(weapon)
     8ADD_SUBDIRECTORY(class_hierarchy)
     9
     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/hud/hud_overlay.h

    r293 r300  
    3333#include "OgrePrerequisites.h"
    3434
     35#include "orxonox_prerequisites.h"
     36
    3537
    3638namespace orxonox {
Note: See TracChangeset for help on using the changeset viewer.