[Orxonox-commit 5294] r9957 - code/trunk/src/modules/invader

[landauf at orxonox.net]

Author: landauf
Date: 2014-01-03 20:28:52 +0100 (Fri, 03 Jan 2014)
New Revision: 9957

Modified:
   code/trunk/src/modules/invader/InvaderHUDinfo.h
   code/trunk/src/modules/invader/InvaderPrereqs.h
Log:
fixed a number of linker warnings with msvc

Modified: code/trunk/src/modules/invader/InvaderHUDinfo.h
===================================================================
--- code/trunk/src/modules/invader/InvaderHUDinfo.h	2014-01-03 19:13:59 UTC (rev 9956)
+++ code/trunk/src/modules/invader/InvaderHUDinfo.h	2014-01-03 19:28:52 UTC (rev 9957)
@@ -27,14 +27,14 @@
 #ifndef _InvaderHUDinfo_H__
 #define _InvaderHUDinfo_H__
 
-#include "overlays/OverlaysPrereqs.h"
+#include "invader/InvaderPrereqs.h"
 
 #include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 
 namespace orxonox
 {
-    class _OverlaysExport InvaderHUDinfo : public OverlayText, public Tickable
+    class _InvaderExport InvaderHUDinfo : public OverlayText, public Tickable
     {
         public:
             InvaderHUDinfo(Context* context);

Modified: code/trunk/src/modules/invader/InvaderPrereqs.h
===================================================================
--- code/trunk/src/modules/invader/InvaderPrereqs.h	2014-01-03 19:13:59 UTC (rev 9956)
+++ code/trunk/src/modules/invader/InvaderPrereqs.h	2014-01-03 19:28:52 UTC (rev 9957)
@@ -42,8 +42,8 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Invader_STATIC_BUILD)
-#  ifdef Invader_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(INVADER_STATIC_BUILD)
+#  ifdef INVADER_SHARED_BUILD
 #    define _InvaderExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )