Changeset 5724 for code/branches

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

Files:

• modules/CMakeLists.txt (modified) (1 diff)
• modules/weapons/CMakeLists.txt (modified) (2 diffs)
• modules/weapons/MuzzleFlash.h (modified) (2 diffs)
• modules/weapons/WeaponsPrereqs.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h) (3 diffs)
• modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• modules/weapons/munitions/FusionMunition.h (modified) (1 diff)
• modules/weapons/munitions/LaserMunition.h (modified) (1 diff)
• modules/weapons/munitions/ReplenishingMunition.h (modified) (2 diffs)
• modules/weapons/projectiles/BillboardProjectile.h (modified) (2 diffs)
• modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• modules/weapons/projectiles/LightningGunProjectile.h (modified) (2 diffs)
• modules/weapons/projectiles/ParticleProjectile.h (modified) (1 diff)
• modules/weapons/projectiles/Projectile.h (modified) (2 diffs)
• modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
• modules/weapons/weaponmodes/EnergyDrink.h (modified) (2 diffs)
• modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
• modules/weapons/weaponmodes/FusionFire.h (modified) (1 diff)
• modules/weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• modules/weapons/weaponmodes/HsW01.h (modified) (2 diffs)
• modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
• modules/weapons/weaponmodes/LaserFire.h (modified) (1 diff)
• modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• modules/weapons/weaponmodes/LightningGun.h (modified) (1 diff)
• orxonox/objects/weaponsystem/CMakeLists.txt (modified) (1 diff)

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

@@ -23 +23 @@
 ADD_SUBDIRECTORY(overlays)
 ADD_SUBDIRECTORY(questsystem)
+ADD_SUBDIRECTORY(weapons)

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

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-  Munition.cc
-  Weapon.cc
-  WeaponMode.cc
-  WeaponPack.cc
-  WeaponSet.cc
-  WeaponSlot.cc
-  WeaponSystem.cc
-  DefaultWeaponmodeLink.cc
-)
-
-SET_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+SET_SOURCE_FILES(WEAPONS_SRC_FILES
   MuzzleFlash.cc
 )
@@ -18 +7 @@
 ADD_SUBDIRECTORY(weaponmodes)
 
-ORXONOX_ADD_LIBRARY(weaponsystem
+ORXONOX_ADD_LIBRARY(weapons
   MODULE
   DEFINE_SYMBOL
-    "WEAPONSYSTEM_SHARED_BUILD"
+    "WEAPONS_SHARED_BUILD"
   LINK_LIBRARIES
     orxonox
-  SOURCE_FILES ${WEAPONSYSTEM_SRC_FILES}
+  SOURCE_FILES ${WEAPONS_SRC_FILES}
 )

code/branches/libraries2/src/modules/weapons/MuzzleFlash.h

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

code/branches/libraries2/src/modules/weapons/WeaponsPrereqs.h

@@ -32 +32 @@
 */
 
-#ifndef _WeaponsystemPrereqs_H__
-#define _WeaponsystemPrereqs_H__
+#ifndef _WeaponsPrereqs_H__
+#define _WeaponsPrereqs_H__
 
 #include "OrxonoxConfig.h"
@@ -43 +43 @@
 //-----------------------------------------------------------------------
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
-#  ifdef WEAPONSYSTEM_SHARED_BUILD
-#    define _WeaponsystemExport __declspec(dllexport)
+#  ifdef WEAPONS_SHARED_BUILD
+#    define _WeaponsExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )
-#      define _WeaponsystemExport
+#      define _WeaponsExport
 #    else
-#      define _WeaponsystemExport __declspec(dllimport)
+#      define _WeaponsExport __declspec(dllimport)
 #    endif
 #  endif
 #elif defined ( ORXONOX_GCC_VISIBILITY )
-#  define _WeaponsystemExport  __attribute__ ((visibility("default")))
+#  define _WeaponsExport  __attribute__ ((visibility("default")))
 #else
-#  define _WeaponsystemExport
+#  define _WeaponsExport
 #endif
 
@@ -82 +82 @@
 }
 
-#endif /* _WeaponsystemPrereqs_H__ */
+#endif /* _WeaponsPrereqs_H__ */

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:

code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.h

@@ -30 +30 @@
 #define _BillboardProjectile_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include "util/Math.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _WeaponsystemExport BillboardProjectile : public Projectile
+    class _WeaponsExport BillboardProjectile : public Projectile
     {
         public:

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

@@ -1 @@
-ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+ADD_SOURCE_FILES(WEAPONS_SRC_FILES
   BillboardProjectile.cc
   ParticleProjectile.cc

code/branches/libraries2/src/modules/weapons/projectiles/LightningGunProjectile.h

@@ -30 +30 @@
 #define _LightningGunProjectile_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include <string>
@@ -38 +38 @@
 namespace orxonox
 {
-    class _WeaponsystemExport LightningGunProjectile : public BillboardProjectile
+    class _WeaponsExport LightningGunProjectile : public BillboardProjectile
     {
         public:

code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.h

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

code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h

@@ -30 +30 @@
 #define _Projectile_H__
 
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
 
 #include "tools/Timer.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _WeaponsystemExport Projectile : public MovableEntity, public PawnListener
+    class _WeaponsExport Projectile : public MovableEntity, public PawnListener
     {
         public:

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

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

code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc

@@ -34 +34 @@
 #include "objects/worldentities/Model.h"
 
-#include "objects/weaponsystem/projectiles/Projectile.h"
-#include "objects/weaponsystem/MuzzleFlash.h"
+#include "weapons/projectiles/Projectile.h"
+#include "weapons/MuzzleFlash.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h

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

code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc

@@ -31 +31 @@
 #include "util/Math.h"
 #include "core/CoreIncludes.h"
-#include "objects/weaponsystem/projectiles/BillboardProjectile.h"
+#include "weapons/projectiles/BillboardProjectile.h"
 
 #include "objects/weaponsystem/Weapon.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h

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

code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc

@@ -34 +34 @@
 #include "objects/worldentities/Model.h"
 
-#include "objects/weaponsystem/projectiles/Projectile.h"
-#include "objects/weaponsystem/MuzzleFlash.h"
+#include "weapons/projectiles/Projectile.h"
+#include "weapons/MuzzleFlash.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h

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

code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "objects/weaponsystem/projectiles/ParticleProjectile.h"
+#include "weapons/projectiles/ParticleProjectile.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h

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

code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "objects/weaponsystem/projectiles/LightningGunProjectile.h"
+#include "weapons/projectiles/LightningGunProjectile.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h

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

code/branches/libraries2/src/orxonox/objects/weaponsystem/CMakeLists.txt

@@ -9 +9 @@
   DefaultWeaponmodeLink.cc
 )
-
-SET_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
-  MuzzleFlash.cc
-)
-
-ADD_SUBDIRECTORY(munitions)
-ADD_SUBDIRECTORY(projectiles)
-ADD_SUBDIRECTORY(weaponmodes)
-
-ORXONOX_ADD_LIBRARY(weaponsystem
-  MODULE
-  DEFINE_SYMBOL
-    "WEAPONSYSTEM_SHARED_BUILD"
-  LINK_LIBRARIES
-    orxonox
-  SOURCE_FILES ${WEAPONSYSTEM_SRC_FILES}
-)