[Orxonox-commit 7131] r11748 - code/branches/Presentation_HS17_merge/src/modules/dialog

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-15 22:36:32 +0100 (Thu, 15 Feb 2018)
New Revision: 11748

Modified:
   code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h
   code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h
   code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h
Log:
[Dialog_HS17] fixed dll linkage for MSVC

Modified: code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h	2018-02-15 21:28:52 UTC (rev 11747)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h	2018-02-15 21:36:32 UTC (rev 11748)
@@ -1,6 +1,7 @@
 #ifndef _AnswerID_H__
 #define _AnswerID_H__
 
+#include "DialogPrereqs.h"
 #include "core/XMLPort.h"
 #include "core/BaseObject.h"
 #include "core/CoreIncludes.h"
@@ -15,7 +16,7 @@
 
 	*/
 
-	class AnswerId : public BaseObject
+	class _DialogExport AnswerId : public BaseObject
 	{
 		public:
 			AnswerId(Context* context);
@@ -30,4 +31,4 @@
 	};
 }
 
-#endif
\ No newline at end of file
+#endif

Modified: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h	2018-02-15 21:28:52 UTC (rev 11747)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h	2018-02-15 21:36:32 UTC (rev 11748)
@@ -25,7 +25,7 @@
         parameters to differ dialog depending on some world values, like items, completed objectives etc...
     */
 
-    class _OrxonoxExport DialogManager //tolua_export
+    class _DialogExport DialogManager //tolua_export
     : public Singleton<DialogManager>
     {//tolua_export
         friend class Singleton<DialogManager>;
@@ -125,4 +125,4 @@
     };//tolua_export
 }//tolua_export
 
-#endif /* _DialogManager_H__ */
\ No newline at end of file
+#endif /* _DialogManager_H__ */

Modified: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h	2018-02-15 21:28:52 UTC (rev 11747)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h	2018-02-15 21:36:32 UTC (rev 11748)
@@ -42,8 +42,8 @@
 // Shared library settings
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Dialog_STATIC_BUILD)
-#  ifdef Dialog_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(DIALOG_STATIC_BUILD)
+#  ifdef DIALOG_SHARED_BUILD
 #    define _DialogExport __declspec(dllexport)
 #  else
 #    if defined( __MINGW32__ )