Fix compilation on LInux

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
index 77c0fccaa069fc0fb9a02bc856f8e680cc21cfc7..3cbd96aa7f99d0f8210aa5c626f5c3db5a8b2376 100644 (file)
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
@@ -35,7 +35,7 @@
     #define NETGENPLUGIN_GUI_EXPORT __declspec( dllimport )
   #endif
 #else
-  #define NETGENPLUGIN_GUI_EXPORTT
+  #define NETGENPLUGIN_GUI_EXPORT
 #endif
 
 #include <SMESHGUI_Hypotheses.h>

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index de8daddfb49cf849dadb010612ee5895328c32e5..83fd8de18b03b6c49828f1a5ea78366589257161 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -70,7 +70,11 @@ NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESHDS_Mesh* meshDS,
     _isVolume(isVolume),
     _optimize(true)
 {
+#ifdef WNT
   netgen::MeshingParameters& mparams = netgen::GlobalMeshingParameters();
+#else
+  netgen::MeshingParameters& mparams = netgen::mparam;
+#endif
   // Initialize global NETGEN parameters by default values:
   // maximal mesh edge size
   mparams.maxh = NETGENPlugin_Hypothesis::GetDefaultMaxSize();
@@ -98,7 +102,11 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
 {
   if (hyp)
   {
+#ifdef WNT
     netgen::MeshingParameters& mparams = netgen::GlobalMeshingParameters();
+#else
+    netgen::MeshingParameters& mparams = netgen::mparam;
+#endif
     // Initialize global NETGEN parameters:
     // maximal mesh segment size
     mparams.maxh = hyp->GetMaxSize();
@@ -149,7 +157,11 @@ Standard_Boolean IsEqual(const Link& aLink1, const Link& aLink2)
 //=============================================================================
 bool NETGENPlugin_Mesher::Compute()
 {
+#ifdef WNT
   netgen::MeshingParameters& mparams = netgen::GlobalMeshingParameters();
+#else
+  netgen::MeshingParameters& mparams = netgen::mparam;
+#endif  
   MESSAGE("Compute with:\n"
           " max size = " << mparams.maxh << "\n"
           " segments per edge = " << mparams.segmentsperedge);