Changeset 10220 for code/branches

Timestamp:

Feb 1, 2015, 1:37:29 PM (10 years ago)

Author:

landauf

Message:

fixed build of objects and mini4Dgame modules (MSVC)

Location:

code/branches/presentationHS14/src/modules

Files:

• mini4Dgame/Mini4DgamePrereqs.h (modified) (3 diffs)
• objects/controllers/TeamTargetProxy.h (modified) (2 diffs)
• objects/controllers/TurretController.cc (modified) (1 diff)
• objects/controllers/TurretController.h (modified) (2 diffs)

code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h

@@ -30 +30 @@
 @file
 @brief
-    Shared library macros, enums, constants and forward declarations for the pong module
+    Shared library macros, enums, constants and forward declarations for the Mini4Dgame module
 */
 
@@ -43 +43 @@
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Mini4Dgame_STATIC_BUILD)
-#  ifdef Mini4Dgame_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(MINI4DGAME_STATIC_BUILD)
+#  ifdef MINI4DGAME_SHARED_BUILD
 #    define _Mini4DgameExport __declspec(dllexport)
 #  else
@@ -72 +72 @@
 }
 
-#endif /* _PongPrereqs_H__ */
+#endif /* _Mini4DgamePrereqs_H__ */

code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h

@@ -30 +30 @@
 #define _TeamTargetProxy_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "controllers/FormationController.h"
 
@@ -45 +45 @@
                         has to be controllable and ticks every second (performance?)
         */
-        class _OrxonoxExport TeamTargetProxy : public FormationController, public Tickable
+        class _ObjectsExport TeamTargetProxy : public FormationController, public Tickable
         {
                 public:

code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc

@@ -29 +29 @@
 #include "TurretController.h"
 #include "worldentities/pawns/Pawn.h"
-#include "Turret.h"
+#include "objects/Turret.h"
 
  namespace orxonox

code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h

@@ -34 +34 @@
 #define _TurretController_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "controllers/ArtificialController.h"
 
@@ -45 +45 @@
                 The controllableEntity gets casted to Turret, so this controller won't work for anything else.
         */
-        class _OrxonoxExport TurretController : public ArtificialController, public Tickable
+        class _ObjectsExport TurretController : public ArtificialController, public Tickable
         {
                 public: