Changeset 11699 for code

Timestamp:

Jan 4, 2018, 1:08:43 AM (7 years ago)

Author:

landauf

Message:

trying to fix build for MSVC but still having trouble with the circular dependency between pickups and overlays

Location:

code/trunk/src

Files:

• libraries/core/module/DynLib.cc (modified) (1 diff)
• modules/dialogue/DialogueManager.h (modified) (1 diff)
• modules/dialogue/DialoguePrereqs.h (modified) (1 diff)
• modules/dialogue/NextQuestion.h (modified) (1 diff)
• modules/superorxobros/SOBPrereqs.h (modified) (1 diff)
• orxonox/worldentities/Actionpoint.cc (modified) (1 diff)

code/trunk/src/libraries/core/module/DynLib.cc

@@ -31 +31 @@
 
 #include "DynLib.h"
+
+#include <algorithm>
 
 #include "util/Exception.h"

code/trunk/src/modules/dialogue/DialogueManager.h

@@ -24 +24 @@
 
 {//tolua_export
-        class _OrxonoxExport DialogueManager //tolua_export
+        class _DialogueExport DialogueManager //tolua_export
         : public Singleton<DialogueManager>
         {//tolua_export

code/trunk/src/modules/dialogue/DialoguePrereqs.h

@@ -44 +44 @@
 
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Dialogue_STATIC_BUILD)
-#  ifdef Dialogue_SHARED_BUILD
+#  ifdef DIALOGUE_SHARED_BUILD
 #    define _DialogueExport __declspec(dllexport)
 #  else

code/trunk/src/modules/dialogue/NextQuestion.h

@@ -13 +13 @@
 
 namespace orxonox{
-        class _OrxonoxExport NextQuestion : public BaseObject
+        class _DialogueExport NextQuestion : public BaseObject
         {
                 

code/trunk/src/modules/superorxobros/SOBPrereqs.h

@@ -44 +44 @@
 
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(SOB_STATIC_BUILD)
-#  ifdef SOB_SHARED_BUILD
+#  ifdef SUPERORXOBROS_SHARED_BUILD
 #    define _SOBExport __declspec(dllexport)
 #  else

code/trunk/src/orxonox/worldentities/Actionpoint.cc

@@ -28 +28 @@
 
 #include "Actionpoint.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 
 namespace orxonox