Changeset 9957 for code/trunk

Timestamp:

Jan 3, 2014, 8:28:52 PM (11 years ago)

Author:

landauf

Message:

fixed a number of linker warnings with msvc

Location:

code/trunk/src/modules/invader

Files:

• InvaderHUDinfo.h (modified) (2 diffs)
• InvaderPrereqs.h (modified) (1 diff)

code/trunk/src/modules/invader/InvaderHUDinfo.h

@@ -28 +28 @@
 #define _InvaderHUDinfo_H__
 
-#include "overlays/OverlaysPrereqs.h"
+#include "invader/InvaderPrereqs.h"
 
 #include "tools/interfaces/Tickable.h"
@@ -35 +35 @@
 namespace orxonox
 {
-    class _OverlaysExport InvaderHUDinfo : public OverlayText, public Tickable
+    class _InvaderExport InvaderHUDinfo : public OverlayText, public Tickable
     {
         public:

code/trunk/src/modules/invader/InvaderPrereqs.h

@@ -43 +43 @@
 //-----------------------------------------------------------------------
 
-#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