Compilation SALOME on Windows

This commit is contained in:
ana 2013-09-09 09:16:42 +00:00
parent 2b3bf05c2b
commit 80be2e8daa
6 changed files with 18 additions and 17 deletions

View File

@ -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
{

View 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();

View 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)

View 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)

View 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:

View 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 )