Changeset 8586 for code/branches/presentation/src/modules/docking

Timestamp:

May 25, 2011, 11:07:46 PM (14 years ago)

Author:

rgrieder

Message:

Fixed MSVC build (dllexport problems) and warnings.

Location:

code/branches/presentation/src/modules/docking

Files:

• DockingController.h (modified) (1 diff)
• DockingPrereqs.h (modified) (1 diff)

code/branches/presentation/src/modules/docking/DockingController.h

@@ -39 +39 @@
 namespace orxonox
 {
-    class _OrxonoxExport DockingController : public ArtificialController, public Tickable
+    class _DockingExport DockingController : public ArtificialController, public Tickable
     {
         public:

code/branches/presentation/src/modules/docking/DockingPrereqs.h

@@ -43 +43 @@
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Docking_STATIC_BUILD)
-#  ifdef Docking_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(DOCKING_STATIC_BUILD)
+#  ifdef DOCKING_SHARED_BUILD
 #    define _DockingExport __declspec(dllexport)
 #  else