Salome HOME
Compilation SALOME on Windows
authorana <ana@opencascade.com>
Mon, 9 Sep 2013 09:16:42 +0000 (09:16 +0000)
committerana <ana@opencascade.com>
Mon, 9 Sep 2013 09:16:42 +0000 (09:16 +0000)
src/AdvancedEngine/GEOM_IAdvancedOperations_i.hh
src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h
src/GEOM/GEOM_BaseDriver.hxx
src/GEOMGUI/Makefile.am
src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
src/SKETCHER/Sketcher_Profile.hxx

index 151049e8cd1a0b29a699a7f451d07cdf578a9b95..d29f3aaf92506291e2aab5bdaa2985635337ed73 100644 (file)
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 #include "GEOM_IOperations_i.hh"
 #include "GEOM_Object_i.hh"
+#include "GEOM_AdvancedEngine.hxx"
 
 #include "GEOMImpl_IAdvancedOperations.hxx"
 
-class GEOM_I_EXPORT GEOM_IAdvancedOperations_i :
+class ADVANCEDENGINE_EXPORT GEOM_IAdvancedOperations_i :
     public virtual POA_GEOM::GEOM_IAdvancedOperations,
     public virtual GEOM_IOperations_i
 {
index fde7d7a626d1f0adbf729bfa4a096791add003f1..1d84d830e91f96be9d63a074ef4676f25eac6fdb 100644 (file)
@@ -61,9 +61,9 @@ private slots:
   bool                               ClickOnApply();
   
   void                               ActivateThisDialog();
-  void                               DeactivateActiveDialog();
+  //void                               DeactivateActiveDialog();
   
-  void                               CheckButtonToggled();
+  //void                               CheckButtonToggled();
   void                               SelectionIntoArgument();
   void                               SetEditCurrentArgument();
   //void                               ValueChangedInSpinBox();
index 045b7509e94b97687c494ae639b03d58aec35934..0508c3d8fdf2a8ae1dd56690aa3b3682e4275f2b 100644 (file)
@@ -44,23 +44,23 @@ struct GEOM_Param
   std::string name;
   std::string value;
 
-  void Set(const char* nm) { name = nm; }
+  Standard_EXPORT void Set(const char* nm) { name = nm; }
   template <class T>
-  void Set(const char* nm, const T& value) { name = nm; (*this)<<value; }
+  Standard_EXPORT void Set(const char* nm, const T& value) { name = nm; (*this)<<value; }
 
-  template <class T> GEOM_Param & operator<<( const T &anything )
+  template <class T> Standard_EXPORT GEOM_Param & operator<<( const T &anything )
   {
     std::ostringstream str;
     str << anything;
     value += str.str() ;
     return *this ;
   }
-  GEOM_Param & operator<<( const Handle(GEOM_Function)& fun );
-  GEOM_Param & operator<<( const Handle(Standard_Transient)& fun );
-  GEOM_Param & operator<<( const Handle(TColStd_HSequenceOfTransient)& funs );
-  GEOM_Param & operator<<( const Handle(TColStd_HArray1OfInteger)& vals );
-  GEOM_Param & operator<<( TopAbs_ShapeEnum type );
-  GEOM_Param & operator<<( TopAbs_State state );
+  Standard_EXPORT GEOM_Param & operator<<( const Handle(GEOM_Function)& fun );
+  Standard_EXPORT GEOM_Param & operator<<( const Handle(Standard_Transient)& fun );
+  Standard_EXPORT GEOM_Param & operator<<( const Handle(TColStd_HSequenceOfTransient)& funs );
+  Standard_EXPORT GEOM_Param & operator<<( const Handle(TColStd_HArray1OfInteger)& vals );
+  Standard_EXPORT GEOM_Param & operator<<( TopAbs_ShapeEnum type );
+  Standard_EXPORT GEOM_Param & operator<<( TopAbs_State state );
 };
 
 
@@ -77,12 +77,12 @@ public:
 
   // Adds GEOM_Param to params and sets its name
   // This method is safer than resizing the params vector and accessing to its items
-  GEOM_Param& AddParam(std::vector<GEOM_Param>& params,
+  Standard_EXPORT GEOM_Param& AddParam(std::vector<GEOM_Param>& params,
                        const char*              name);
 
   // Adds GEOM_Param to params vector and sets its name and value
   // This method is safer than resizing the params vector and accessing to its items
-  template <class T> GEOM_Param& AddParam(std::vector<GEOM_Param>& params,
+  template <class T> Standard_EXPORT GEOM_Param& AddParam(std::vector<GEOM_Param>& params,
                                           const char*              name,
                                           const T&                 value,
                                           const char*              dfltValue = 0)
index c476494ddb7c46622a9dcf7600e27e377f95381e..0e30791d7faa4e98dce58ec3205ca66bf0ffb6cb 100644 (file)
@@ -91,7 +91,7 @@ libGEOM_la_LDFLAGS =                                          \
        ../Material/libMaterial.la                              \
        ../GEOMClient/libGEOMClient.la                          \
        ../OBJECT/libGEOMObject.la                              \
-       $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient            \
+       $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDS -lSalomeDSClient         \
        $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd    \
        $(OPENCV_LIBS)
 
index e89a67fd8357d5f7ec57f358308427e31d0e21ca..0ec4b35e6addff5a35d9fe1cd1fa878c10ab5b6f 100644 (file)
@@ -1043,7 +1043,7 @@ GetCreationInformation(std::string&             theOperationName,
     if ( !shapes.IsNull() && shapes->Length() > 1 )
       AddParam( theParams, "Shape", shapes->Value(2) );
     AddParam( theParams, "Shape type", TopAbs_ShapeEnum( aCI.GetSubShapeType() ));
-    AddParam( theParams, "State", TopAbs_State( aCI.GetTolerance() ));
+    AddParam( theParams, "State", TopAbs_State((int) aCI.GetTolerance() ));
     break;
   }
   default:
index 5b66eb6ab4a1c695ce28845e2d5935c978b44b79..c1783ce1e46d8c6d718629a7846068fbb10125cd 100644 (file)
@@ -24,7 +24,7 @@
 //  Author : Damien COQUERET
 
 #if defined WIN32
-#  if defined SKETCHER_SALOME_EXPORTS || defined SKETCHER_EXPORTS
+#  if defined SKETCHER_SALOME_EXPORTS || defined SKETCHER_EXPORTS || defined GEOMSketcher_EXPORTS || defined GEOMSKETCHER_EXPORTS
 #    define SKETCHER_SALOME_EXPORT _declspec( dllexport )
 #  else
 #    define SKETCHER_SALOME_EXPORT _declspec( dllimport )