Prepare SALOME-6.4.0 for Win32 platform.

diff --git a/src/GUI/GHS3DPluginGUI.cxx b/src/GUI/GHS3DPluginGUI.cxx
index 96a9dba38aaa276548f44fedbebb78913fe8c19e..8811e36579678fd9fe219c5bb25f90abf98b3f30 100644 (file)
--- a/src/GUI/GHS3DPluginGUI.cxx
+++ b/src/GUI/GHS3DPluginGUI.cxx
@@ -22,14 +22,6 @@
 // Authors : Gilles DAVID (Euriware)
 // ---
 //
-#ifdef WNT
-// E.A. : On windows with python 2.6, there is a conflict
-// E.A. : between pymath.h and Standard_math.h which define
-// E.A. : some same symbols : acosh, asinh, ...
-#include <Standard_math.hxx>
-#include <pymath.h>
-#endif
-
 #include "GHS3DPluginGUI_HypothesisCreator.h"
 
 //=============================================================================

diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.h b/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
index a71f6c25e821bb7bc6403234a0756485247e37c4..2052404f962fa38746544780237940b8ab8d8f13 100644 (file)
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.h
@@ -191,7 +191,7 @@ protected slots:
   void                addEnforcedMesh(std::string name, std::string entry, int elementType, double size = 0, std::string groupName = "");
   void                onAddEnforcedMesh();
   void                onRemoveEnforcedMesh();
-  void                synchronizeEnforcedMesh();
+  //void                synchronizeEnforcedMesh();
   void                checkEnfMeshIsDefined();
   
 signals:

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 3c3f4a0f422c11ea72325fdc7ccf0129ca60243e..76d43740a151e22e4e3fb2648b0ca7c27565f179 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -62,7 +62,7 @@ libGHS3DPluginGUI_la_LDFLAGS  = \
        $(QT_LIBS) \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
        $(MED_LDFLAGS) -lSalomeIDLMED \
-       $(SMESH_LDFLAGS) -lSMESH -lGeomSelectionTools  -lStdMeshersGUI\
+       $(SMESH_LDFLAGS) -lGEOM -lSMESH -lGeomSelectionTools  -lStdMeshersGUI -lSMESHFiltersSelection \
        $(GUI_LDFLAGS) -lsuit -lqtx -lSalomeApp \
        $(CAS_KERNEL)