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 410c0eabf3c95fe425a5a1e78936150190e804f0..125e5eef2062027dfd18f86905585dc913230f72 100644 (file)
--- 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 a4f7e995c605ab4fcfac0e6426140fef8d6e56ac..9bc53cf18f09a5f22fedad4991cba2bb8c914bde 100644 (file)
--- 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 df4c1c833ac635cda5e751734ca73bab7329da46..5e00c8072c826d0263c18fced4d13af70cf84d22 100644 (file)
--- 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