Changeset 5693 for code/trunk/src/orxonox/objects/weaponsystem/munitions
- Timestamp:
- Aug 29, 2009, 10:19:38 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/weaponsystem/munitions/CMakeLists.txt
r3053 r5693 1 ADD_SOURCE_FILES( ORXONOX_SRC_FILES1 ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES 2 2 ReplenishingMunition.cc 3 3 LaserMunition.cc -
code/trunk/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h
r3053 r5693 30 30 #define _FusionMunition_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "objects/weaponsystem/WeaponsystemPrereqs.h" 33 33 #include "objects/weaponsystem/Munition.h" 34 34 35 35 namespace orxonox 36 36 { 37 class _ OrxonoxExport FusionMunition : public Munition37 class _WeaponsystemExport FusionMunition : public Munition 38 38 { 39 39 public: -
code/trunk/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h
r3053 r5693 30 30 #define _LaserMunition_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "objects/weaponsystem/WeaponsystemPrereqs.h" 33 33 #include "ReplenishingMunition.h" 34 34 35 35 namespace orxonox 36 36 { 37 class _ OrxonoxExport LaserMunition : public ReplenishingMunition37 class _WeaponsystemExport LaserMunition : public ReplenishingMunition 38 38 { 39 39 public: -
code/trunk/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h
r3196 r5693 30 30 #define _ReplenishingMunition_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "objects/weaponsystem/WeaponsystemPrereqs.h" 33 33 34 34 #include "tools/Timer.h" … … 37 37 namespace orxonox 38 38 { 39 class _ OrxonoxExport ReplenishingMunition : public Munition39 class _WeaponsystemExport ReplenishingMunition : public Munition 40 40 { 41 41 public:
Note: See TracChangeset
for help on using the changeset viewer.