From: rnv <rnv@opencascade.com>
Date: Thu, 17 Nov 2011 14:18:13 +0000 (+0000)
Subject: Prepare SALOME-6.4.0 for Win32 platform.
X-Git-Tag: V6_4_0~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=71a614b30e83765e549dfd27ea9ab21065193ad9;p=plugins%2Fhybridplugin.git

Prepare SALOME-6.4.0 for Win32 platform.
---

diff --git a/src/GUI/GHS3DPluginGUI.cxx b/src/GUI/GHS3DPluginGUI.cxx
index 96a9dba..8811e36 100644
--- 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 a71f6c2..2052404 100644
--- 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 3c3f4a0..76d4374 100644
--- 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)