Changeset 11748 for code/branches/Presentation_HS17_merge

Timestamp:

Feb 15, 2018, 10:36:32 PM (7 years ago)

Author:

landauf

Message:

[Dialog_HS17] fixed dll linkage for MSVC

Location:

code/branches/Presentation_HS17_merge/src/modules/dialog

Files:

• AnswerId.h (modified) (2 diffs)
• DialogManager.h (modified) (1 diff)
• DialogPrereqs.h (modified) (1 diff)

code/branches/Presentation_HS17_merge/src/modules/dialog/AnswerId.h

@@ -2 +2 @@
 #define _AnswerID_H__
 
+#include "DialogPrereqs.h"
 #include "core/XMLPort.h"
 #include "core/BaseObject.h"
@@ -16 +17 @@
         */
 
-        class AnswerId : public BaseObject
+        class _DialogExport AnswerId : public BaseObject
         {
                 public:

code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.h

@@ -26 +26 @@
     */
 
-    class _OrxonoxExport DialogManager //tolua_export
+    class _DialogExport DialogManager //tolua_export
     : public Singleton<DialogManager>
     {//tolua_export

code/branches/Presentation_HS17_merge/src/modules/dialog/DialogPrereqs.h

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