[Orxonox-commit 1003] r5724 - in code/branches/libraries2/src: modules modules/weapons modules/weapons/munitions modules/weapons/projectiles modules/weapons/weaponmodes orxonox/objects/weaponsystem
landauf at orxonox.net
landauf at orxonox.net
Mon Aug 31 18:08:27 CEST 2009
Author: landauf
Date: 2009-08-31 18:08:26 +0200 (Mon, 31 Aug 2009)
New Revision: 5724
Added:
code/branches/libraries2/src/modules/weapons/WeaponsPrereqs.h
Removed:
code/branches/libraries2/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h
Modified:
code/branches/libraries2/src/modules/CMakeLists.txt
code/branches/libraries2/src/modules/weapons/CMakeLists.txt
code/branches/libraries2/src/modules/weapons/MuzzleFlash.h
code/branches/libraries2/src/modules/weapons/munitions/CMakeLists.txt
code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h
code/branches/libraries2/src/modules/weapons/munitions/LaserMunition.h
code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h
code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.h
code/branches/libraries2/src/modules/weapons/projectiles/CMakeLists.txt
code/branches/libraries2/src/modules/weapons/projectiles/LightningGunProjectile.h
code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.h
code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h
code/branches/libraries2/src/modules/weapons/weaponmodes/CMakeLists.txt
code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h
code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h
code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h
code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h
code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc
code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h
code/branches/libraries2/src/orxonox/objects/weaponsystem/CMakeLists.txt
Log:
moved WeaponsystemPrereqs.h to the weapons module too, renamed as WeaponsPrereqs.h
renamed _WeaponsystemExport as _WeaponsExport
changed paths accordingly
compiles again
Modified: code/branches/libraries2/src/modules/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/CMakeLists.txt 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/CMakeLists.txt 2009-08-31 16:08:26 UTC (rev 5724)
@@ -22,3 +22,4 @@
ADD_SUBDIRECTORY(gamestates)
ADD_SUBDIRECTORY(overlays)
ADD_SUBDIRECTORY(questsystem)
+ADD_SUBDIRECTORY(weapons)
Modified: code/branches/libraries2/src/modules/weapons/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/weapons/CMakeLists.txt 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/CMakeLists.txt 2009-08-31 16:08:26 UTC (rev 5724)
@@ -1,15 +1,4 @@
-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
)
@@ -17,11 +6,11 @@
ADD_SUBDIRECTORY(projectiles)
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}
)
Modified: code/branches/libraries2/src/modules/weapons/MuzzleFlash.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/MuzzleFlash.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/MuzzleFlash.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,14 +29,14 @@
#ifndef _MuzzleFlash_H__
#define _MuzzleFlash_H__
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include "tools/Timer.h"
#include "objects/worldentities/Billboard.h"
namespace orxonox
{
- class _WeaponsystemExport MuzzleFlash : public Billboard
+ class _WeaponsExport MuzzleFlash : public Billboard
{
public:
MuzzleFlash(BaseObject* creator);
Copied: code/branches/libraries2/src/modules/weapons/WeaponsPrereqs.h (from rev 5722, code/branches/libraries2/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h)
===================================================================
--- code/branches/libraries2/src/modules/weapons/WeaponsPrereqs.h (rev 0)
+++ code/branches/libraries2/src/modules/weapons/WeaponsPrereqs.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -0,0 +1,84 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Contains all the necessary forward declarations for all classes and structs.
+*/
+
+#ifndef _WeaponsPrereqs_H__
+#define _WeaponsPrereqs_H__
+
+#include "OrxonoxConfig.h"
+
+#include "OrxonoxPrereqs.h"
+
+//-----------------------------------------------------------------------
+// Shared library settings
+//-----------------------------------------------------------------------
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+# ifdef WEAPONS_SHARED_BUILD
+# define _WeaponsExport __declspec(dllexport)
+# else
+# if defined( __MINGW32__ )
+# define _WeaponsExport
+# else
+# define _WeaponsExport __declspec(dllimport)
+# endif
+# endif
+#elif defined ( ORXONOX_GCC_VISIBILITY )
+# define _WeaponsExport __attribute__ ((visibility("default")))
+#else
+# define _WeaponsExport
+#endif
+
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+ class LaserFire;
+ class FusionFire;
+ class HsW01;
+ class LightningGun;
+ class EnergyDrink;
+
+ class Projectile;
+ class BillboardProjectile;
+ class ParticleProjectile;
+ class LightningGunProjectile;
+
+ class ReplenishingMunition;
+ class LaserMunition;
+ class FusionMunition;
+
+ class MuzzleFlash;
+}
+
+#endif /* _WeaponsPrereqs_H__ */
Modified: code/branches/libraries2/src/modules/weapons/munitions/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/weapons/munitions/CMakeLists.txt 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/munitions/CMakeLists.txt 2009-08-31 16:08:26 UTC (rev 5724)
@@ -1,4 +1,4 @@
-ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+ADD_SOURCE_FILES(WEAPONS_SRC_FILES
ReplenishingMunition.cc
LaserMunition.cc
FusionMunition.cc
Modified: code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,12 +29,12 @@
#ifndef _FusionMunition_H__
#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:
FusionMunition(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/munitions/LaserMunition.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/munitions/LaserMunition.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/munitions/LaserMunition.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,12 +29,12 @@
#ifndef _LaserMunition_H__
#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:
LaserMunition(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,14 +29,14 @@
#ifndef _ReplenishingMunition_H__
#define _ReplenishingMunition_H__
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include "tools/Timer.h"
#include "objects/weaponsystem/Munition.h"
namespace orxonox
{
- class _WeaponsystemExport ReplenishingMunition : public Munition
+ class _WeaponsExport ReplenishingMunition : public Munition
{
public:
ReplenishingMunition(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,7 +29,7 @@
#ifndef _BillboardProjectile_H__
#define _BillboardProjectile_H__
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include "util/Math.h"
#include "tools/BillboardSet.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _WeaponsystemExport BillboardProjectile : public Projectile
+ class _WeaponsExport BillboardProjectile : public Projectile
{
public:
BillboardProjectile(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/projectiles/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/CMakeLists.txt 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/projectiles/CMakeLists.txt 2009-08-31 16:08:26 UTC (rev 5724)
@@ -1,4 +1,4 @@
-ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+ADD_SOURCE_FILES(WEAPONS_SRC_FILES
BillboardProjectile.cc
ParticleProjectile.cc
Projectile.cc
Modified: code/branches/libraries2/src/modules/weapons/projectiles/LightningGunProjectile.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/LightningGunProjectile.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/projectiles/LightningGunProjectile.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,7 +29,7 @@
#ifndef _LightningGunProjectile_H__
#define _LightningGunProjectile_H__
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include <string>
#include "tools/Timer.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _WeaponsystemExport LightningGunProjectile : public BillboardProjectile
+ class _WeaponsExport LightningGunProjectile : public BillboardProjectile
{
public:
LightningGunProjectile(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,12 +29,12 @@
#ifndef _ParticleProjectile_H__
#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:
ParticleProjectile(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,7 +29,7 @@
#ifndef _Projectile_H__
#define _Projectile_H__
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include "tools/Timer.h"
#include "interfaces/PawnListener.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _WeaponsystemExport Projectile : public MovableEntity, public PawnListener
+ class _WeaponsExport Projectile : public MovableEntity, public PawnListener
{
public:
Projectile(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/CMakeLists.txt 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/CMakeLists.txt 2009-08-31 16:08:26 UTC (rev 5724)
@@ -1,4 +1,4 @@
-ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+ADD_SOURCE_FILES(WEAPONS_SRC_FILES
EnergyDrink.cc
FusionFire.cc
LaserFire.cc
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc 2009-08-31 16:08:26 UTC (rev 5724)
@@ -33,8 +33,8 @@
#include "core/XMLPort.h"
#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"
#include "objects/weaponsystem/WeaponSystem.h"
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,7 +29,7 @@
#ifndef _EnergyDrink_H__
#define _EnergyDrink_H__
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include <string>
#include "tools/Timer.h"
@@ -37,7 +37,7 @@
namespace orxonox
{
- class _WeaponsystemExport EnergyDrink : public WeaponMode
+ class _WeaponsExport EnergyDrink : public WeaponMode
{
public:
EnergyDrink(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc 2009-08-31 16:08:26 UTC (rev 5724)
@@ -30,7 +30,7 @@
#include "util/Math.h"
#include "core/CoreIncludes.h"
-#include "objects/weaponsystem/projectiles/BillboardProjectile.h"
+#include "weapons/projectiles/BillboardProjectile.h"
#include "objects/weaponsystem/Weapon.h"
#include "objects/weaponsystem/WeaponPack.h"
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,12 +29,12 @@
#ifndef _FusionFire_H__
#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:
FusionFire(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc 2009-08-31 16:08:26 UTC (rev 5724)
@@ -33,8 +33,8 @@
#include "core/XMLPort.h"
#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"
#include "objects/weaponsystem/WeaponSystem.h"
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,14 +29,14 @@
#ifndef _HsW01_H__
#define _HsW01_H__
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include "tools/Timer.h"
#include "objects/weaponsystem/WeaponMode.h"
namespace orxonox
{
- class _WeaponsystemExport HsW01 : public WeaponMode
+ class _WeaponsExport HsW01 : public WeaponMode
{
public:
HsW01(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,7 +29,7 @@
#include "LaserFire.h"
#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"
#include "objects/weaponsystem/WeaponSystem.h"
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,12 +29,12 @@
#ifndef _LaserFire_H__
#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:
LaserFire(BaseObject* creator);
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,7 +29,7 @@
#include "LightningGun.h"
#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"
#include "objects/weaponsystem/WeaponSystem.h"
Modified: code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h
===================================================================
--- code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -29,12 +29,12 @@
#ifndef _LightningGun_H__
#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:
LightningGun(BaseObject* creator);
Modified: code/branches/libraries2/src/orxonox/objects/weaponsystem/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/orxonox/objects/weaponsystem/CMakeLists.txt 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/orxonox/objects/weaponsystem/CMakeLists.txt 2009-08-31 16:08:26 UTC (rev 5724)
@@ -8,20 +8,3 @@
WeaponSystem.cc
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}
-)
Deleted: code/branches/libraries2/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h
===================================================================
--- code/branches/libraries2/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h 2009-08-31 15:50:17 UTC (rev 5723)
+++ code/branches/libraries2/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h 2009-08-31 16:08:26 UTC (rev 5724)
@@ -1,84 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief Contains all the necessary forward declarations for all classes and structs.
-*/
-
-#ifndef _WeaponsystemPrereqs_H__
-#define _WeaponsystemPrereqs_H__
-
-#include "OrxonoxConfig.h"
-
-#include "OrxonoxPrereqs.h"
-
-//-----------------------------------------------------------------------
-// Shared library settings
-//-----------------------------------------------------------------------
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
-# ifdef WEAPONSYSTEM_SHARED_BUILD
-# define _WeaponsystemExport __declspec(dllexport)
-# else
-# if defined( __MINGW32__ )
-# define _WeaponsystemExport
-# else
-# define _WeaponsystemExport __declspec(dllimport)
-# endif
-# endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
-# define _WeaponsystemExport __attribute__ ((visibility("default")))
-#else
-# define _WeaponsystemExport
-#endif
-
-//-----------------------------------------------------------------------
-// Forward declarations
-//-----------------------------------------------------------------------
-
-namespace orxonox
-{
- class LaserFire;
- class FusionFire;
- class HsW01;
- class LightningGun;
- class EnergyDrink;
-
- class Projectile;
- class BillboardProjectile;
- class ParticleProjectile;
- class LightningGunProjectile;
-
- class ReplenishingMunition;
- class LaserMunition;
- class FusionMunition;
-
- class MuzzleFlash;
-}
-
-#endif /* _WeaponsystemPrereqs_H__ */
More information about the Orxonox-commit
mailing list