Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 258


Ignore:
Timestamp:
Nov 26, 2007, 4:26:17 PM (18 years ago)
Author:
landauf
Message:

merged object-hierarchy back to trunk

Location:
code/trunk/src
Files:
1 edited
26 copied
1 moved

Legend:

Unmodified
Added
Removed

  • code/trunk/src/CMakeLists.txt

    r164 r258  
    22
    33# create a few variables to simplify life
    4 
    5 SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc)
    6 SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h)
     4SET(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)
     5SET(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)
    76
    87#Creates an executable

  • code/trunk/src/orxonox/orxonox.cc

    r257 r258  
    3939#include <iostream>
    4040
    41 #include "xml/xmlParser.h"
    42 #include "loader/LevelLoader.h"
     41#include "../xml/xmlParser.h"
     42#include "../loader/LevelLoader.h"
    4343
    4444
    … …  
    194194      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
    195195    }
    196    
     196
    197197    void setupScene()
    198198    {
Note: See TracChangeset for help on using the changeset viewer.