Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 748 for code/branches/FICN/src


Ignore:
Timestamp:
Dec 31, 2007, 4:53:44 AM (17 years ago)
Author:
landauf
Message:
  • moved BillboardSet, Light, Mesh and Timer to the new util folder
  • changed CML files (I hope I did it correctly for both operating systems)
Location:
code/branches/FICN/src
Files:
1 deleted
3 edited
7 moved

Legend:

Unmodified
Added
Removed
  • code/branches/FICN/src/orxonox/CMakeLists.txt

    r744 r748  
    55IF(NOT WIN32)
    66  ADD_SUBDIRECTORY(objects)
     7  ADD_SUBDIRECTORY(tools)
    78ENDIF(NOT WIN32)
    89ADD_SUBDIRECTORY(particle)
     
    1718
    1819IF(WIN32)
     20  INCLUDE_DIRECTORIES(tools)
     21
    1922  SET( OBJECTS_SRC_FILES
    2023    objects/WorldEntity.cc
     
    2831    objects/Fighter.cc
    2932    objects/Model.cc
    30     objects/Mesh.cc
    31     objects/Light.cc
    3233    objects/SpaceShip.cc
    3334    objects/NPC.cc
    34     objects/BillboardSet.cc
    3535    objects/Projectile.cc
    3636    objects/weapon_system/AmmunitionDump.cc
     
    4141    objects/weapon_system/WeaponStation.cc
    4242    objects/Explosion.cc
     43    tools/BillboardSet.cc
     44    tools/Light.cc
     45    tools/Mesh.cc
    4346  )
    4447ELSE(WIN32)
    4548  SET(LINK_OBJECTS_LIBRARY objects)
     49  SET(LINK_OBJECTS_LIBRARY tools)
    4650ENDIF(WIN32)
    4751
  • code/branches/FICN/src/orxonox/Orxonox.cc

    r742 r748  
    6464// objects
    6565#include "objects/Tickable.h"
    66 #include "objects/Timer.h"
     66#include "tools/Timer.h"
    6767#include "objects/NPC.h"
    6868#include "core/ArgReader.h"
  • code/branches/FICN/src/orxonox/objects/CMakeLists.txt

    r744 r748  
    11PROJECT(Orxonox)
     2
     3INCLUDE_DIRECTORIES(../tools)
    24
    35SET( OBJECTS_SRC_FILES
Note: See TracChangeset for help on using the changeset viewer.