From: vsr <vsr@opencascade.com>
Date: Thu, 27 Oct 2011 15:34:58 +0000 (+0000)
Subject: Merge from V6_3_BR branch (Windows porting) 27/10/2011
X-Git-Tag: V6_4_0a1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5db60967fa25ea88a76d282abe0e75c7b7b97a50;p=plugins%2Fblsurfplugin.git

Merge from V6_3_BR branch (Windows porting) 27/10/2011
---

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
index 410c0ea..125e5ee 100644
--- a/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Attractor.cxx
@@ -145,7 +145,8 @@ bool BLSURFPlugin_Attractor::init(){
     _DMap[i0][j0] = 0.;
     _trial.insert(TPnt);                                                       // Move starting point to _trial
   }
-    
+
+  return true;
 }
 
 void BLSURFPlugin_Attractor::edgeInit(Handle(Geom_Surface) theSurf, const TopoDS_Edge& anEdge){
diff --git a/src/BLSURFPlugin/Makefile.am b/src/BLSURFPlugin/Makefile.am
index a4f7e99..9bc53cf 100644
--- a/src/BLSURFPlugin/Makefile.am
+++ b/src/BLSURFPlugin/Makefile.am
@@ -64,10 +64,10 @@ libBLSURFEngine_la_CPPFLAGS =	\
 libBLSURFEngine_la_LDFLAGS  =			\
 	../../idl/libSalomeIDLBLSURFPLUGIN.la	\
 	$(PYTHON_LIBS) \
-	$(CAS_KERNEL) -lTKBRep -lTKGeomBase -lTKGeomAlgo -lTKTopAlgo -lTKLCAF -lTKXSBase -lTKG2d -lTKG3d \
+	$(CAS_KERNEL) -lTKBRep -lTKGeomBase -lTKGeomAlgo -lTKTopAlgo -lTKLCAF -lTKXSBase -lTKG2d -lTKG3d -lTKShHealing \
 	$(BLSURF_LIBS) \
 	$(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine -lSMDS -lSMESHDS	\
 	$(GEOM_LDFLAGS) -lGEOMbasic \
 	$(MED_LDFLAGS) -lSalomeIDLMED \
-	$(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSALOMELocalTrace -lSALOMEBasics \
+	$(KERNEL_LDFLAGS) -lOpUtil -lSalomeGenericObj -lSalomeNS -lSALOMELocalTrace -lSALOMEBasics \
 	$(BOOST_LIB_REGEX)
diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index df4c1c8..5e00c80 100644
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -64,7 +64,8 @@ libBLSURFPluginGUI_la_LDFLAGS =			\
 	$(QT_LIBS) \
 	../BLSURFPlugin/libBLSURFEngine.la	\
 	$(GUI_LDFLAGS) -lqtx -lSalomeApp -lsuit -lSalomeObject -lLightApp	\
-	${SMESH_LDFLAGS} -lSMESH -lGeomSelectionTools -lStdMeshersGUI \
+	$(GEOM_LDFLAGS) -lGEOM \
+	${SMESH_LDFLAGS} -lSMESH -lGeomSelectionTools -lStdMeshersGUI -lSMESHFiltersSelection \
 	$(CAS_KERNEL) $(BLSURF_LIBS)
 
 # resources files