From 80be2e8daa53ff409af646490cffd27bb13716ae Mon Sep 17 00:00:00 2001 From: ana Date: Mon, 9 Sep 2013 09:16:42 +0000 Subject: [PATCH] Compilation SALOME on Windows --- .../GEOM_IAdvancedOperations_i.hh | 3 ++- .../AdvancedGUI_SmoothingSurfaceDlg.h | 4 ++-- src/GEOM/GEOM_BaseDriver.hxx | 22 +++++++++---------- src/GEOMGUI/Makefile.am | 2 +- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 2 +- src/SKETCHER/Sketcher_Profile.hxx | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/AdvancedEngine/GEOM_IAdvancedOperations_i.hh b/src/AdvancedEngine/GEOM_IAdvancedOperations_i.hh index 151049e8c..d29f3aaf9 100644 --- a/src/AdvancedEngine/GEOM_IAdvancedOperations_i.hh +++ b/src/AdvancedEngine/GEOM_IAdvancedOperations_i.hh @@ -30,10 +30,11 @@ #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 { diff --git a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h index fde7d7a62..1d84d830e 100644 --- a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h +++ b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h @@ -61,9 +61,9 @@ private slots: bool ClickOnApply(); void ActivateThisDialog(); - void DeactivateActiveDialog(); + //void DeactivateActiveDialog(); - void CheckButtonToggled(); + //void CheckButtonToggled(); void SelectionIntoArgument(); void SetEditCurrentArgument(); //void ValueChangedInSpinBox(); diff --git a/src/GEOM/GEOM_BaseDriver.hxx b/src/GEOM/GEOM_BaseDriver.hxx index 045b7509e..0508c3d8f 100644 --- a/src/GEOM/GEOM_BaseDriver.hxx +++ b/src/GEOM/GEOM_BaseDriver.hxx @@ -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 - void Set(const char* nm, const T& value) { name = nm; (*this)< GEOM_Param & operator<<( const T &anything ) + template 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& params, + Standard_EXPORT GEOM_Param& AddParam(std::vector& 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 GEOM_Param& AddParam(std::vector& params, + template Standard_EXPORT GEOM_Param& AddParam(std::vector& params, const char* name, const T& value, const char* dfltValue = 0) diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am index c476494dd..0e30791d7 100644 --- a/src/GEOMGUI/Makefile.am +++ b/src/GEOMGUI/Makefile.am @@ -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) diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index e89a67fd8..0ec4b35e6 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -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: diff --git a/src/SKETCHER/Sketcher_Profile.hxx b/src/SKETCHER/Sketcher_Profile.hxx index 5b66eb6ab..c1783ce1e 100644 --- a/src/SKETCHER/Sketcher_Profile.hxx +++ b/src/SKETCHER/Sketcher_Profile.hxx @@ -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 )