Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5724 for code/branches


Ignore:
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:
24 edited
1 moved

Legend:

Unmodified
Added
Removed
  • code/branches/libraries2/src/modules/CMakeLists.txt

    r5722 r5724  
    2323ADD_SUBDIRECTORY(overlays)
    2424ADD_SUBDIRECTORY(questsystem)
     25ADD_SUBDIRECTORY(weapons)
  • code/branches/libraries2/src/modules/weapons/CMakeLists.txt

    r5723 r5724  
    1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    2   Munition.cc
    3   Weapon.cc
    4   WeaponMode.cc
    5   WeaponPack.cc
    6   WeaponSet.cc
    7   WeaponSlot.cc
    8   WeaponSystem.cc
    9   DefaultWeaponmodeLink.cc
    10 )
    11 
    12 SET_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
     1SET_SOURCE_FILES(WEAPONS_SRC_FILES
    132  MuzzleFlash.cc
    143)
     
    187ADD_SUBDIRECTORY(weaponmodes)
    198
    20 ORXONOX_ADD_LIBRARY(weaponsystem
     9ORXONOX_ADD_LIBRARY(weapons
    2110  MODULE
    2211  DEFINE_SYMBOL
    23     "WEAPONSYSTEM_SHARED_BUILD"
     12    "WEAPONS_SHARED_BUILD"
    2413  LINK_LIBRARIES
    2514    orxonox
    26   SOURCE_FILES ${WEAPONSYSTEM_SRC_FILES}
     15  SOURCE_FILES ${WEAPONS_SRC_FILES}
    2716)
  • code/branches/libraries2/src/modules/weapons/MuzzleFlash.h

    r5723 r5724  
    3030#define _MuzzleFlash_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333
    3434#include "tools/Timer.h"
     
    3737namespace orxonox
    3838{
    39     class _WeaponsystemExport MuzzleFlash : public Billboard
     39    class _WeaponsExport MuzzleFlash : public Billboard
    4040    {
    4141        public:
  • code/branches/libraries2/src/modules/weapons/WeaponsPrereqs.h

    r5722 r5724  
    3232*/
    3333
    34 #ifndef _WeaponsystemPrereqs_H__
    35 #define _WeaponsystemPrereqs_H__
     34#ifndef _WeaponsPrereqs_H__
     35#define _WeaponsPrereqs_H__
    3636
    3737#include "OrxonoxConfig.h"
     
    4343//-----------------------------------------------------------------------
    4444#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
    45 #  ifdef WEAPONSYSTEM_SHARED_BUILD
    46 #    define _WeaponsystemExport __declspec(dllexport)
     45#  ifdef WEAPONS_SHARED_BUILD
     46#    define _WeaponsExport __declspec(dllexport)
    4747#  else
    4848#    if defined( __MINGW32__ )
    49 #      define _WeaponsystemExport
     49#      define _WeaponsExport
    5050#    else
    51 #      define _WeaponsystemExport __declspec(dllimport)
     51#      define _WeaponsExport __declspec(dllimport)
    5252#    endif
    5353#  endif
    5454#elif defined ( ORXONOX_GCC_VISIBILITY )
    55 #  define _WeaponsystemExport  __attribute__ ((visibility("default")))
     55#  define _WeaponsExport  __attribute__ ((visibility("default")))
    5656#else
    57 #  define _WeaponsystemExport
     57#  define _WeaponsExport
    5858#endif
    5959
     
    8282}
    8383
    84 #endif /* _WeaponsystemPrereqs_H__ */
     84#endif /* _WeaponsPrereqs_H__ */
  • code/branches/libraries2/src/modules/weapons/munitions/CMakeLists.txt

    r5693 r5724  
    1 ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
     1ADD_SOURCE_FILES(WEAPONS_SRC_FILES
    22  ReplenishingMunition.cc
    33  LaserMunition.cc
  • code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h

    r5693 r5724  
    3030#define _FusionMunition_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333#include "objects/weaponsystem/Munition.h"
    3434
    3535namespace orxonox
    3636{
    37     class _WeaponsystemExport FusionMunition : public Munition
     37    class _WeaponsExport FusionMunition : public Munition
    3838    {
    3939        public:
  • code/branches/libraries2/src/modules/weapons/munitions/LaserMunition.h

    r5693 r5724  
    3030#define _LaserMunition_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333#include "ReplenishingMunition.h"
    3434
    3535namespace orxonox
    3636{
    37     class _WeaponsystemExport LaserMunition : public ReplenishingMunition
     37    class _WeaponsExport LaserMunition : public ReplenishingMunition
    3838    {
    3939        public:
  • code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h

    r5693 r5724  
    3030#define _ReplenishingMunition_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333
    3434#include "tools/Timer.h"
     
    3737namespace orxonox
    3838{
    39     class _WeaponsystemExport ReplenishingMunition : public Munition
     39    class _WeaponsExport ReplenishingMunition : public Munition
    4040    {
    4141        public:
  • code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.h

    r5693 r5724  
    3030#define _BillboardProjectile_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333
    3434#include "util/Math.h"
     
    3838namespace orxonox
    3939{
    40     class _WeaponsystemExport BillboardProjectile : public Projectile
     40    class _WeaponsExport BillboardProjectile : public Projectile
    4141    {
    4242        public:
  • code/branches/libraries2/src/modules/weapons/projectiles/CMakeLists.txt

    r5693 r5724  
    1 ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
     1ADD_SOURCE_FILES(WEAPONS_SRC_FILES
    22  BillboardProjectile.cc
    33  ParticleProjectile.cc
  • code/branches/libraries2/src/modules/weapons/projectiles/LightningGunProjectile.h

    r5693 r5724  
    3030#define _LightningGunProjectile_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333
    3434#include <string>
     
    3838namespace orxonox
    3939{
    40     class _WeaponsystemExport LightningGunProjectile : public BillboardProjectile
     40    class _WeaponsExport LightningGunProjectile : public BillboardProjectile
    4141    {
    4242        public:
  • code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.h

    r5693 r5724  
    3030#define _ParticleProjectile_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333#include "BillboardProjectile.h"
    3434
    3535namespace orxonox
    3636{
    37     class _WeaponsystemExport ParticleProjectile : public BillboardProjectile
     37    class _WeaponsExport ParticleProjectile : public BillboardProjectile
    3838    {
    3939        public:
  • code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h

    r5693 r5724  
    3030#define _Projectile_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333
    3434#include "tools/Timer.h"
     
    3838namespace orxonox
    3939{
    40     class _WeaponsystemExport Projectile : public MovableEntity, public PawnListener
     40    class _WeaponsExport Projectile : public MovableEntity, public PawnListener
    4141    {
    4242        public:
  • code/branches/libraries2/src/modules/weapons/weaponmodes/CMakeLists.txt

    r5693 r5724  
    1 ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
     1ADD_SOURCE_FILES(WEAPONS_SRC_FILES
    22  EnergyDrink.cc
    33  FusionFire.cc
  • code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc

    r3196 r5724  
    3434#include "objects/worldentities/Model.h"
    3535
    36 #include "objects/weaponsystem/projectiles/Projectile.h"
    37 #include "objects/weaponsystem/MuzzleFlash.h"
     36#include "weapons/projectiles/Projectile.h"
     37#include "weapons/MuzzleFlash.h"
    3838#include "objects/weaponsystem/Weapon.h"
    3939#include "objects/weaponsystem/WeaponPack.h"
  • code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h

    r5693 r5724  
    3030#define _EnergyDrink_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333
    3434#include <string>
     
    3838namespace orxonox
    3939{
    40     class _WeaponsystemExport EnergyDrink : public WeaponMode
     40    class _WeaponsExport EnergyDrink : public WeaponMode
    4141    {
    4242        public:
  • code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc

    r3196 r5724  
    3131#include "util/Math.h"
    3232#include "core/CoreIncludes.h"
    33 #include "objects/weaponsystem/projectiles/BillboardProjectile.h"
     33#include "weapons/projectiles/BillboardProjectile.h"
    3434
    3535#include "objects/weaponsystem/Weapon.h"
  • code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h

    r5693 r5724  
    3030#define _FusionFire_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333#include "objects/weaponsystem/WeaponMode.h"
    3434
    3535namespace orxonox
    3636{
    37     class _WeaponsystemExport FusionFire : public WeaponMode
     37    class _WeaponsExport FusionFire : public WeaponMode
    3838    {
    3939        public:
  • code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc

    r3196 r5724  
    3434#include "objects/worldentities/Model.h"
    3535
    36 #include "objects/weaponsystem/projectiles/Projectile.h"
    37 #include "objects/weaponsystem/MuzzleFlash.h"
     36#include "weapons/projectiles/Projectile.h"
     37#include "weapons/MuzzleFlash.h"
    3838#include "objects/weaponsystem/Weapon.h"
    3939#include "objects/weaponsystem/WeaponPack.h"
  • code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h

    r5693 r5724  
    3030#define _HsW01_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333
    3434#include "tools/Timer.h"
     
    3737namespace orxonox
    3838{
    39     class _WeaponsystemExport HsW01 : public WeaponMode
     39    class _WeaponsExport HsW01 : public WeaponMode
    4040    {
    4141        public:
  • code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc

    r3196 r5724  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "objects/weaponsystem/projectiles/ParticleProjectile.h"
     32#include "weapons/projectiles/ParticleProjectile.h"
    3333#include "objects/weaponsystem/Weapon.h"
    3434#include "objects/weaponsystem/WeaponPack.h"
  • code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h

    r5693 r5724  
    3030#define _LaserFire_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333#include "objects/weaponsystem/WeaponMode.h"
    3434
    3535namespace orxonox
    3636{
    37     class _WeaponsystemExport LaserFire : public WeaponMode
     37    class _WeaponsExport LaserFire : public WeaponMode
    3838    {
    3939        public:
  • code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc

    r3196 r5724  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "objects/weaponsystem/projectiles/LightningGunProjectile.h"
     32#include "weapons/projectiles/LightningGunProjectile.h"
    3333#include "objects/weaponsystem/Weapon.h"
    3434#include "objects/weaponsystem/WeaponPack.h"
  • code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h

    r5693 r5724  
    3030#define _LightningGun_H__
    3131
    32 #include "objects/weaponsystem/WeaponsystemPrereqs.h"
     32#include "weapons/WeaponsPrereqs.h"
    3333#include "objects/weaponsystem/WeaponMode.h"
    3434
    3535namespace orxonox
    3636{
    37     class _WeaponsystemExport LightningGun : public WeaponMode
     37    class _WeaponsExport LightningGun : public WeaponMode
    3838    {
    3939        public:
  • code/branches/libraries2/src/orxonox/objects/weaponsystem/CMakeLists.txt

    r5693 r5724  
    99  DefaultWeaponmodeLink.cc
    1010)
    11 
    12 SET_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
    13   MuzzleFlash.cc
    14 )
    15 
    16 ADD_SUBDIRECTORY(munitions)
    17 ADD_SUBDIRECTORY(projectiles)
    18 ADD_SUBDIRECTORY(weaponmodes)
    19 
    20 ORXONOX_ADD_LIBRARY(weaponsystem
    21   MODULE
    22   DEFINE_SYMBOL
    23     "WEAPONSYSTEM_SHARED_BUILD"
    24   LINK_LIBRARIES
    25     orxonox
    26   SOURCE_FILES ${WEAPONSYSTEM_SRC_FILES}
    27 )
Note: See TracChangeset for help on using the changeset viewer.