[Orxonox-commit 5557] r10220 - in code/branches/presentationHS14/src/modules: mini4Dgame objects/controllers

[landauf at orxonox.net]

Author: landauf
Date: 2015-02-01 13:37:29 +0100 (Sun, 01 Feb 2015)
New Revision: 10220

Modified:
   code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h
   code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h
   code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc
   code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h
Log:
fixed build of objects and mini4Dgame modules (MSVC)

Modified: code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h
===================================================================
--- code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h	2015-01-31 22:54:35 UTC (rev 10219)
+++ code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h	2015-02-01 12:37:29 UTC (rev 10220)
@@ -29,7 +29,7 @@
 /**
 @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
 */
 
 #ifndef _Mini4DgamePrereqs_H__
@@ -42,8 +42,8 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#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
 #    if defined( __MINGW32__ )
@@ -71,4 +71,4 @@
     class Mini4DgameBoard;
 }
 
-#endif /* _PongPrereqs_H__ */
+#endif /* _Mini4DgamePrereqs_H__ */

Modified: code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h
===================================================================
--- code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h	2015-01-31 22:54:35 UTC (rev 10219)
+++ code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h	2015-02-01 12:37:29 UTC (rev 10220)
@@ -29,7 +29,7 @@
 #ifndef _TeamTargetProxy_H__
 #define _TeamTargetProxy_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "controllers/FormationController.h"
 
  namespace orxonox
@@ -44,7 +44,7 @@
 			because the turret isn't directly attached to the spaceship. Here's where this controller comes in. Drawback: the base
 			has to be controllable and ticks every second (performance?)
  	*/
- 	class _OrxonoxExport TeamTargetProxy : public FormationController, public Tickable
+ 	class _ObjectsExport TeamTargetProxy : public FormationController, public Tickable
  	{
  		public:
  			TeamTargetProxy(Context* context);
@@ -57,4 +57,4 @@
  	};
  }
 
- #endif
\ No newline at end of file
+ #endif

Modified: code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc
===================================================================
--- code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc	2015-01-31 22:54:35 UTC (rev 10219)
+++ code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc	2015-02-01 12:37:29 UTC (rev 10220)
@@ -28,7 +28,7 @@
 
 #include "TurretController.h"
 #include "worldentities/pawns/Pawn.h"
-#include "Turret.h"
+#include "objects/Turret.h"
 
  namespace orxonox
  {
@@ -199,4 +199,4 @@
  			}
  		}
  	}
- }
\ No newline at end of file
+ }

Modified: code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h
===================================================================
--- code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h	2015-01-31 22:54:35 UTC (rev 10219)
+++ code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h	2015-02-01 12:37:29 UTC (rev 10220)
@@ -33,7 +33,7 @@
 #ifndef _TurretController_H__
 #define _TurretController_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 #include "controllers/ArtificialController.h"
 
  namespace orxonox
@@ -44,7 +44,7 @@
 
  		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:
  			TurretController(Context* context);
@@ -62,4 +62,4 @@
  	};
  }
 
- #endif
\ No newline at end of file
+ #endif