Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10220


Ignore:
Timestamp:
Feb 1, 2015, 1:37:29 PM (5 years ago)
Author:
landauf
Message:

fixed build of objects and mini4Dgame modules (MSVC)

Location:
code/branches/presentationHS14/src/modules
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentationHS14/src/modules/mini4Dgame/Mini4DgamePrereqs.h

    r10156 r10220  
    3030@file
    3131@brief
    32     Shared library macros, enums, constants and forward declarations for the pong module
     32    Shared library macros, enums, constants and forward declarations for the Mini4Dgame module
    3333*/
    3434
     
    4343//-----------------------------------------------------------------------
    4444
    45 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Mini4Dgame_STATIC_BUILD)
    46 #  ifdef Mini4Dgame_SHARED_BUILD
     45#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(MINI4DGAME_STATIC_BUILD)
     46#  ifdef MINI4DGAME_SHARED_BUILD
    4747#    define _Mini4DgameExport __declspec(dllexport)
    4848#  else
     
    7272}
    7373
    74 #endif /* _PongPrereqs_H__ */
     74#endif /* _Mini4DgamePrereqs_H__ */
  • code/branches/presentationHS14/src/modules/objects/controllers/TeamTargetProxy.h

    r10147 r10220  
    3030#define _TeamTargetProxy_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "objects/ObjectsPrereqs.h"
    3333#include "controllers/FormationController.h"
    3434
     
    4545                        has to be controllable and ticks every second (performance?)
    4646        */
    47         class _OrxonoxExport TeamTargetProxy : public FormationController, public Tickable
     47        class _ObjectsExport TeamTargetProxy : public FormationController, public Tickable
    4848        {
    4949                public:
  • code/branches/presentationHS14/src/modules/objects/controllers/TurretController.cc

    r10147 r10220  
    2929#include "TurretController.h"
    3030#include "worldentities/pawns/Pawn.h"
    31 #include "Turret.h"
     31#include "objects/Turret.h"
    3232
    3333 namespace orxonox
  • code/branches/presentationHS14/src/modules/objects/controllers/TurretController.h

    r10147 r10220  
    3434#define _TurretController_H__
    3535
    36 #include "OrxonoxPrereqs.h"
     36#include "objects/ObjectsPrereqs.h"
    3737#include "controllers/ArtificialController.h"
    3838
     
    4545                The controllableEntity gets casted to Turret, so this controller won't work for anything else.
    4646        */
    47         class _OrxonoxExport TurretController : public ArtificialController, public Tickable
     47        class _ObjectsExport TurretController : public ArtificialController, public Tickable
    4848        {
    4949                public:
Note: See TracChangeset for help on using the changeset viewer.