[Orxonox-commit 7114] r11731 - code/branches/Presentation_HS17_merge/src/modules/asteroidmining

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-11 17:13:24 +0100 (Sun, 11 Feb 2018)
New Revision: 11731

Added:
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h
Modified:
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h
   code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h
Log:
[AsteroidMining_HS17] fixed dll linkage for MSVC

Modified: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h	2018-02-11 15:52:54 UTC (rev 11730)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h	2018-02-11 16:13:24 UTC (rev 11731)
@@ -73,7 +73,7 @@
 #ifndef _AsteroidMinable_H__
 #define _AsteroidMinable_H__
 
-#include "OrxonoxPrereqs.h"
+#include "AsteroidMiningPrereqs.h"
 
 #include <string>
 #include <vector>
@@ -87,7 +87,7 @@
 namespace orxonox{
 
 
-    class _OrxonoxExport AsteroidMinable : public Pawn{ 
+    class _AsteroidMiningExport AsteroidMinable : public Pawn{
 
         public:
             // @brief This constructor is for XML access only!

Added: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h	                        (rev 0)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMiningPrereqs.h	2018-02-11 16:13:24 UTC (rev 11731)
@@ -0,0 +1,75 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      ...
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+/**
+ at file
+ at brief
+    Shared library macros, enums, constants and forward declarations for the AsteroidMining module
+*/
+
+#ifndef _AsteroidMiningPrereqs_H__
+#define _AsteroidMiningPrereqs_H__
+
+#include "OrxonoxConfig.h"
+#include "OrxonoxPrereqs.h"
+
+//-----------------------------------------------------------------------
+// Shared library settings
+//-----------------------------------------------------------------------
+
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ASTEROIDMINING_STATIC_BUILD)
+#  ifdef ASTEROIDMINING_SHARED_BUILD
+#    define _AsteroidMiningExport __declspec(dllexport)
+#  else
+#    if defined( __MINGW32__ )
+#      define _AsteroidMiningExport
+#    else
+#      define _AsteroidMiningExport __declspec(dllimport)
+#    endif
+#  endif
+#  define _AsteroidMiningPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
+#  define _AsteroidMiningExport  __attribute__ ((visibility("default")))
+#  define _AsteroidMiningPrivate __attribute__ ((visibility("hidden")))
+#else
+#  define _AsteroidMiningExport
+#  define _AsteroidMiningPrivate
+#endif
+
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+    class AsteroidMinable;
+    class SpicedAsteroidBelt;
+    class SpicedAsteroidField;
+}
+
+#endif /* _AsteroidMiningPrereqs_H__ */

Modified: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h	2018-02-11 15:52:54 UTC (rev 11730)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.h	2018-02-11 16:13:24 UTC (rev 11731)
@@ -46,7 +46,7 @@
 #ifndef _SpicedAsteroidBelt_H__
 #define _SpicedAsteroidBelt_H__
 
-#include "OrxonoxPrereqs.h"
+#include "AsteroidMiningPrereqs.h"
 
 #include <string>
 #include <vector>
@@ -58,7 +58,7 @@
 {
 
     // tolua_export
-    class _OrxonoxExport SpicedAsteroidBelt : public Pawn // need pawn to get tick for clean argument passing
+    class _AsteroidMiningExport SpicedAsteroidBelt : public Pawn // need pawn to get tick for clean argument passing
     { // tolua_export
 
         public:

Modified: code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h	2018-02-11 15:52:54 UTC (rev 11730)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h	2018-02-11 16:13:24 UTC (rev 11731)
@@ -40,7 +40,7 @@
 #ifndef _SpicedAsteroidField_H__
 #define _SpicedAsteroidField_H__
 
-#include "OrxonoxPrereqs.h"
+#include "AsteroidMiningPrereqs.h"
 
 #include <string>
 #include <vector>
@@ -52,7 +52,7 @@
 {
 
     // tolua_export
-    class _OrxonoxExport SpicedAsteroidField : public Pawn // need pawn to get tick for clean argument passing
+    class _AsteroidMiningExport SpicedAsteroidField : public Pawn // need pawn to get tick for clean argument passing
     { // tolua_export
 
         public: