Changeset 2458
- Timestamp:
- Dec 15, 2008, 12:37:09 AM (16 years ago)
- Location:
- code/branches/physics_merge/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/physics_merge/src/orxonox/CMakeLists.txt
r2442 r2458 48 48 tinyxml_orxonox 49 49 tolualib_orxonox 50 LibBulletDynamics51 LibBulletCollision52 Li bLinearMath50 BulletDynamics 51 BulletCollision 52 LinearMath 53 53 util 54 54 core -
code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.cc
r2442 r2458 33 33 34 34 #include <OgreEntity.h> 35 #include <Ogre Mesh.h>35 #include <OgreBillboardSet.h> 36 36 #include <OgreHardwareVertexBuffer.h> 37 37 #include <OgreMeshManager.h> -
code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.h
r2436 r2458 31 31 32 32 #include "OrxonoxPrereqs.h" 33 34 #include <OgreMesh.h> 33 35 34 36 #include "tools/BillboardSet.h" -
code/branches/physics_merge/src/util/Integers.h
r1755 r2458 49 49 typedef unsigned __int32 uint32_t; 50 50 typedef unsigned __int64 uint64_t; 51 #el if ORXONOX_COMPILER == ORXONOX_COMPILER_GCC52 # include "inttypes.h"51 #else 52 # include <inttypes.h> 53 53 #endif 54 54
Note: See TracChangeset
for help on using the changeset viewer.