Changeset 5730 for code/branches/libraries2/src/modules/objects/triggers

Timestamp:

Aug 31, 2009, 10:38:48 PM (15 years ago)

Author:

landauf

Message:

Added CMakeLists, ObjectsPrereqs.h and _ObjectsExport
Changed Paths in the files of the objects module
Compiles now again

Btw, I had to link the objects module into the weaponsystem module because the projectile is hardcoded at the moment and therefore needs a collision shape. This will be changed somewhen in the future.

Location:

code/branches/libraries2/src/modules/objects/triggers

Files:

• CMakeLists.txt (modified) (1 diff)
• CheckPoint.h (modified) (2 diffs)
• DistanceTrigger.h (modified) (2 diffs)
• EventTrigger.h (modified) (1 diff)
• Trigger.h (modified) (2 diffs)

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

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(OBJECTS_SRC_FILES
   Trigger.cc
   DistanceTrigger.cc

code/branches/libraries2/src/modules/objects/triggers/CheckPoint.h

@@ -35 +35 @@
 #define _CheckPoint_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 
 #include "interfaces/RadarViewable.h"
@@ -42 +42 @@
 namespace orxonox
 {
-    class _OrxonoxExport CheckPoint : public DistanceTrigger, public RadarViewable
+    class _ObjectsExport CheckPoint : public DistanceTrigger, public RadarViewable
     {
     public:

code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h

@@ -30 +30 @@
 #define _DistanceTrigger_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 
 #include <set>
@@ -39 +39 @@
 namespace orxonox
 {
-  class _OrxonoxExport DistanceTrigger : public Trigger, public PlayerTrigger
+  class _ObjectsExport DistanceTrigger : public Trigger, public PlayerTrigger
   {
     public:

code/branches/libraries2/src/modules/objects/triggers/EventTrigger.h

@@ -30 +30 @@
 #define _EventTrigger_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "Trigger.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport EventTrigger : public Trigger
+    class _ObjectsExport EventTrigger : public Trigger
     {
         public:

code/branches/libraries2/src/modules/objects/triggers/Trigger.h

@@ -30 +30 @@
 #define _Trigger_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 
 #include <set>
@@ -51 +51 @@
   }
 
-  class _OrxonoxExport Trigger : public StaticEntity, public Tickable
+  class _ObjectsExport Trigger : public StaticEntity, public Tickable
   {
     public: