[Orxonox-commit 7082] r11699 - in code/trunk/src: libraries/core/module modules/dialogue modules/superorxobros orxonox/worldentities

[landauf at orxonox.net]

Author: landauf
Date: 2018-01-04 01:08:43 +0100 (Thu, 04 Jan 2018)
New Revision: 11699

Modified:
   code/trunk/src/libraries/core/module/DynLib.cc
   code/trunk/src/modules/dialogue/DialogueManager.h
   code/trunk/src/modules/dialogue/DialoguePrereqs.h
   code/trunk/src/modules/dialogue/NextQuestion.h
   code/trunk/src/modules/superorxobros/SOBPrereqs.h
   code/trunk/src/orxonox/worldentities/Actionpoint.cc
Log:
trying to fix build for MSVC but still having trouble with the circular dependency between pickups and overlays

Modified: code/trunk/src/libraries/core/module/DynLib.cc
===================================================================
--- code/trunk/src/libraries/core/module/DynLib.cc	2018-01-03 10:19:53 UTC (rev 11698)
+++ code/trunk/src/libraries/core/module/DynLib.cc	2018-01-04 00:08:43 UTC (rev 11699)
@@ -31,6 +31,8 @@
 
 #include "DynLib.h"
 
+#include <algorithm>
+
 #include "util/Exception.h"
 
 #ifdef ORXONOX_PLATFORM_WINDOWS

Modified: code/trunk/src/modules/dialogue/DialogueManager.h
===================================================================
--- code/trunk/src/modules/dialogue/DialogueManager.h	2018-01-03 10:19:53 UTC (rev 11698)
+++ code/trunk/src/modules/dialogue/DialogueManager.h	2018-01-04 00:08:43 UTC (rev 11699)
@@ -23,7 +23,7 @@
 namespace orxonox //tolua_export
 
 {//tolua_export
-	class _OrxonoxExport DialogueManager //tolua_export
+	class _DialogueExport DialogueManager //tolua_export
 	: public Singleton<DialogueManager>
 	{//tolua_export
 		friend class Singleton<DialogueManager>;
@@ -71,4 +71,4 @@
 
 	};//tolua_export
 }//tolua_export
-#endif
\ No newline at end of file
+#endif

Modified: code/trunk/src/modules/dialogue/DialoguePrereqs.h
===================================================================
--- code/trunk/src/modules/dialogue/DialoguePrereqs.h	2018-01-03 10:19:53 UTC (rev 11698)
+++ code/trunk/src/modules/dialogue/DialoguePrereqs.h	2018-01-04 00:08:43 UTC (rev 11699)
@@ -43,7 +43,7 @@
 //-----------------------------------------------------------------------
 
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Dialogue_STATIC_BUILD)
-#  ifdef Dialogue_SHARED_BUILD
+#  ifdef DIALOGUE_SHARED_BUILD
 #    define _DialogueExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )

Modified: code/trunk/src/modules/dialogue/NextQuestion.h
===================================================================
--- code/trunk/src/modules/dialogue/NextQuestion.h	2018-01-03 10:19:53 UTC (rev 11698)
+++ code/trunk/src/modules/dialogue/NextQuestion.h	2018-01-04 00:08:43 UTC (rev 11699)
@@ -12,7 +12,7 @@
 
 
 namespace orxonox{
-	class _OrxonoxExport NextQuestion : public BaseObject
+	class _DialogueExport NextQuestion : public BaseObject
 	{
 		
 		//tolua_begin
@@ -58,4 +58,4 @@
 	};
 	
 }
-#endif
\ No newline at end of file
+#endif

Modified: code/trunk/src/modules/superorxobros/SOBPrereqs.h
===================================================================
--- code/trunk/src/modules/superorxobros/SOBPrereqs.h	2018-01-03 10:19:53 UTC (rev 11698)
+++ code/trunk/src/modules/superorxobros/SOBPrereqs.h	2018-01-04 00:08:43 UTC (rev 11699)
@@ -43,7 +43,7 @@
 //-----------------------------------------------------------------------
 
 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(SOB_STATIC_BUILD)
-#  ifdef SOB_SHARED_BUILD
+#  ifdef SUPERORXOBROS_SHARED_BUILD
 #    define _SOBExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )

Modified: code/trunk/src/orxonox/worldentities/Actionpoint.cc
===================================================================
--- code/trunk/src/orxonox/worldentities/Actionpoint.cc	2018-01-03 10:19:53 UTC (rev 11698)
+++ code/trunk/src/orxonox/worldentities/Actionpoint.cc	2018-01-04 00:08:43 UTC (rev 11699)
@@ -28,6 +28,9 @@
 
 #include "Actionpoint.h"
 
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
 namespace orxonox
 {
     RegisterClass(Actionpoint);