Changeset 5724 for code/branches/libraries2/src/modules/weapons/munitions

Timestamp:

Aug 31, 2009, 6:08:26 PM (15 years ago)

Author:

landauf

Message:

moved WeaponsystemPrereqs.h to the weapons module too, renamed as WeaponsPrereqs.h
renamed _WeaponsystemExport as _WeaponsExport
changed paths accordingly
compiles again

Location:

code/branches/libraries2/src/modules/weapons/munitions

Files:

• CMakeLists.txt (modified) (1 diff)
• FusionMunition.h (modified) (1 diff)
• LaserMunition.h (modified) (1 diff)
• ReplenishingMunition.h (modified) (2 diffs)

code/branches/libraries2/src/modules/weapons/munitions/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+ADD_SOURCE_FILES(WEAPONS_SRC_FILES
   ReplenishingMunition.cc
   LaserMunition.cc

code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h

@@ -30 +30 @@
 #define _FusionMunition_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 #include "objects/weaponsystem/Munition.h"
 
 namespace orxonox
 {
-    class _WeaponsystemExport FusionMunition : public Munition
+    class _WeaponsExport FusionMunition : public Munition
     {
         public:

code/branches/libraries2/src/modules/weapons/munitions/LaserMunition.h

@@ -30 +30 @@
 #define _LaserMunition_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 #include "ReplenishingMunition.h"
 
 namespace orxonox
 {
-    class _WeaponsystemExport LaserMunition : public ReplenishingMunition
+    class _WeaponsExport LaserMunition : public ReplenishingMunition
     {
         public:

code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h

@@ -30 +30 @@
 #define _ReplenishingMunition_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include "tools/Timer.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _WeaponsystemExport ReplenishingMunition : public Munition
+    class _WeaponsExport ReplenishingMunition : public Munition
     {
         public: