Changeset 5693 for code/trunk/src/orxonox/objects/weaponsystem/weaponmodes

Timestamp:

Aug 29, 2009, 10:19:38 PM (15 years ago)

Author:

landauf

Message:

merged libraries branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
   EnergyDrink.cc
   FusionFire.cc

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h

@@ -30 +30 @@
 #define _EnergyDrink_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include <string>
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport EnergyDrink : public WeaponMode
+    class _WeaponsystemExport EnergyDrink : public WeaponMode
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h

@@ -30 +30 @@
 #define _FusionFire_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport FusionFire : public WeaponMode
+    class _WeaponsystemExport FusionFire : public WeaponMode
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h

@@ -30 +30 @@
 #define _HsW01_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include "tools/Timer.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport HsW01 : public WeaponMode
+    class _WeaponsystemExport HsW01 : public WeaponMode
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h

@@ -30 +30 @@
 #define _LaserFire_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport LaserFire : public WeaponMode
+    class _WeaponsystemExport LaserFire : public WeaponMode
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h

@@ -30 +30 @@
 #define _LightningGun_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport LightningGun : public WeaponMode
+    class _WeaponsystemExport LightningGun : public WeaponMode
     {
         public: