From 688d92ed57163c37eb8679bfc28bcce1f6323639 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 1 Mar 2010 16:37:18 +0000 Subject: [PATCH] windows port. --- src/NETGENPlugin/Makefile.am | 1 + src/NETGENPlugin/NETGENPlugin_Mesher.cxx | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/NETGENPlugin/Makefile.am b/src/NETGENPlugin/Makefile.am index 849330b..48546e0 100644 --- a/src/NETGENPlugin/Makefile.am +++ b/src/NETGENPlugin/Makefile.am @@ -93,5 +93,6 @@ endif libNETGENEngine_la_LDFLAGS += \ ../../idl/libSalomeIDLNETGENPLUGIN.la \ $(CAS_LDPATH) -lTKernel -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKMesh -lTKSTL -lTKG3d -lTKTopAlgo -lTKG2d -lTKBool -lTKGeomAlgo -lTKOffset -lTKGeomBase -lTKBO \ + $(MED_LDFLAGS) -lSalomeIDLMED \ $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine -lStdMeshers -lSMESHDS -lSMDS -lSMESHControls \ $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lOpUtil diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx index 7a20b1a..e86bf08 100644 --- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx @@ -107,11 +107,7 @@ NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESH_Mesh* mesh, void NETGENPlugin_Mesher::defaultParameters() { -#ifdef WNT - netgen::MeshingParameters& mparams = netgen::GlobalMeshingParameters(); -#else netgen::MeshingParameters& mparams = netgen::mparam; -#endif // maximal mesh edge size mparams.maxh = NETGENPlugin_Hypothesis::GetDefaultMaxSize(); // minimal number of segments per edge @@ -138,11 +134,7 @@ 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(); @@ -822,11 +814,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo, 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); @@ -1083,11 +1071,7 @@ bool NETGENPlugin_Mesher::Compute() //============================================================================= bool NETGENPlugin_Mesher::Evaluate(MapShapeNbElems& aResMap) { -#ifdef WNT - netgen::MeshingParameters& mparams = netgen::GlobalMeshingParameters(); -#else netgen::MeshingParameters& mparams = netgen::mparam; -#endif // ------------------------- -- 2.39.2