First Working WIN32 version

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index 4620967b3137f4649c61ae2ff2d40ebb097dc94a..ccc427fa94cf7b6073875184e2124f6241f98153 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -7,8 +7,6 @@
 // Copyright : CEA 2003
 // $Header$
 //=============================================================================
-using namespace std;
-
 #include "NETGENPlugin_NETGEN_3D.hxx"
 
 #include "SMESH_Gen.hxx"
@@ -33,7 +31,14 @@ using namespace std;
   Netgen include files
 */
 
-#include "nglib.h"
+namespace nglib
+{
+  #include <nglib.h>
+}
+
+using namespace nglib;
+
+using namespace std;
 
 //=============================================================================
 /*!

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
index b0858806d77f236d98d003de63bae8d911d188c6..7785365eaac18898534ae3e47abd13e64183873f 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
@@ -11,12 +11,22 @@
 #ifndef _NETGENPlugin_NETGEN_3D_HXX_
 #define _NETGENPlugin_NETGEN_3D_HXX_
 
+#ifdef WIN32
+  #ifdef NETGENPLUGIN_EXPORTS
+    #define NETGENPLUGIN_EXPORT __declspec( dllexport )
+  #else
+    #define NETGENPLUGIN_EXPORT __declspec( dllimport )
+  #endif
+#else
+  #define NETGENPLUGIN_EXPORT
+#endif
+
 #include "SMESH_3D_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 #include "StdMeshers_MaxElementVolume.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
-class NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
+class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
 {
 public:
   NETGENPlugin_NETGEN_3D(int hypId, int studyId, SMESH_Gen* gen);

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
index 489d6822e6a5fb8d4fdf8f5494818f72b88786fc..2e06f2352818dca3130f791fc38248553c8ee3bc 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
@@ -27,13 +27,14 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "NETGENPlugin_NETGEN_3D_i.hxx"
 #include "SMESH_Gen.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *  NETGENPlugin_NETGEN_3D_i::NETGENPlugin_NETGEN_3D_i

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
index 275988ea8411b5272c08a76042e29c0b10a8f381..ab781241e38453ec76c5336e444030de39ce4b7d 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
@@ -39,7 +39,7 @@
 // ======================================================
 // NETGEN 3d algorithm
 // ======================================================
-class NETGENPlugin_NETGEN_3D_i:
+class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D_i:
   public virtual POA_NETGENPlugin::NETGENPlugin_NETGEN_3D,
   public virtual SMESH_3D_Algo_i
 {

diff --git a/src/NETGENPlugin/NETGENPlugin_i.cxx b/src/NETGENPlugin/NETGENPlugin_i.cxx
index a08f1bee6b945bcbdd2b26d8b7097dc57577360e..ef7fb17befd873fbafbf835dc7bbd72a37b85583 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_i.cxx
@@ -26,11 +26,12 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #include "utilities.h"
 
 #include "NETGENPlugin_NETGEN_3D_i.hxx"
 
+using namespace std;
+
 //=============================================================================
 /*!
  *
@@ -39,6 +40,7 @@ using namespace std;
 
 extern "C"
 {
+  NETGENPLUGIN_EXPORT
   GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName)
   {
     MESSAGE("GetHypothesisCreator " << aHypName);