ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-09-22 18:52:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

Win32 compatibility

Browse Source
This commit is contained in:
ana 2014-09-23 15:48:25 +04:00
parent 95e15e30c2
commit 76d199bd79
24 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx
View File

@ -23,8 +23,6 @@
#ifndef _AdvancedEngine_DividedDiskDriver_HXX #ifndef _AdvancedEngine_DividedDiskDriver_HXX
#define _AdvancedEngine_DividedDiskDriver_HXX #define _AdvancedEngine_DividedDiskDriver_HXX
#include "AdvancedEngine.hxx"
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
#include <TFunction_Driver.hxx> #include <TFunction_Driver.hxx>
@ -37,7 +35,7 @@ class gp_Ax3;
DEFINE_STANDARD_HANDLE( AdvancedEngine_DividedDiskDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( AdvancedEngine_DividedDiskDriver, GEOM_BaseDriver );
class ADVANCEDENGINE_EXPORT AdvancedEngine_DividedDiskDriver : public GEOM_BaseDriver class AdvancedEngine_DividedDiskDriver : public GEOM_BaseDriver
{ {
public: public:
// Methods PUBLIC // Methods PUBLIC

4
src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx
View File

@ -20,8 +20,6 @@
#ifndef _AdvancedEngine_PipeTShapeDriver_HXX #ifndef _AdvancedEngine_PipeTShapeDriver_HXX
#define _AdvancedEngine_PipeTShapeDriver_HXX #define _AdvancedEngine_PipeTShapeDriver_HXX
#include "AdvancedEngine.hxx"
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
#include "GEOMAlgo_State.hxx" #include "GEOMAlgo_State.hxx"
@ -32,7 +30,7 @@
DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver );
class ADVANCEDENGINE_EXPORT AdvancedEngine_PipeTShapeDriver : public GEOM_BaseDriver class AdvancedEngine_PipeTShapeDriver : public GEOM_BaseDriver
{ {
public: public:
// Methods PUBLIC // Methods PUBLIC

4
src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx
View File

@ -20,8 +20,6 @@
#ifndef _AdvancedEngine_SmoothingSurfaceDriver_HXX #ifndef _AdvancedEngine_SmoothingSurfaceDriver_HXX
#define _AdvancedEngine_SmoothingSurfaceDriver_HXX #define _AdvancedEngine_SmoothingSurfaceDriver_HXX
#include "AdvancedEngine.hxx"
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
#include <TFunction_Logbook.hxx> #include <TFunction_Logbook.hxx>
@ -30,7 +28,7 @@
DEFINE_STANDARD_HANDLE( AdvancedEngine_SmoothingSurfaceDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( AdvancedEngine_SmoothingSurfaceDriver, GEOM_BaseDriver );
class ADVANCEDENGINE_EXPORT AdvancedEngine_SmoothingSurfaceDriver : public GEOM_BaseDriver class AdvancedEngine_SmoothingSurfaceDriver : public GEOM_BaseDriver
{ {
public: public:
// Methods PUBLIC // Methods PUBLIC

2
src/BREPPlugin/BREPPlugin_Engine.hxx
View File

@ -21,7 +21,7 @@
#define _BREPPLUGIN_ENGINE_HXX_ #define _BREPPLUGIN_ENGINE_HXX_
#ifdef WIN32 #ifdef WIN32
#if defined BREPPLUGINENGINE_EXPORTS || defined BREPPLUGINENGINE_EXPORTS #if defined BREPPluginEngine_EXPORTS
#define BREPPLUGINENGINE_EXPORT __declspec( dllexport ) #define BREPPLUGINENGINE_EXPORT __declspec( dllexport )
#else #else
#define BREPPLUGINENGINE_EXPORT __declspec( dllimport ) #define BREPPLUGINENGINE_EXPORT __declspec( dllimport )

5
src/BREPPlugin/BREPPlugin_ExportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _BREPPlugin_ExportDriver_HXX #ifndef _BREPPlugin_ExportDriver_HXX
#define _BREPPlugin_ExportDriver_HXX #define _BREPPlugin_ExportDriver_HXX
// internal includes
#include "BREPPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver );
class BREPPLUGINENGINE_EXPORT BREPPlugin_ExportDriver : public GEOM_BaseDriver class BREPPlugin_ExportDriver : public GEOM_BaseDriver
{ {
public: public:
BREPPlugin_ExportDriver(); BREPPlugin_ExportDriver();

5
src/BREPPlugin/BREPPlugin_ImportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _BREPPlugin_ImportDriver_HXX #ifndef _BREPPlugin_ImportDriver_HXX
#define _BREPPlugin_ImportDriver_HXX #define _BREPPlugin_ImportDriver_HXX
// internal includes
#include "BREPPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver );
class BREPPLUGINENGINE_EXPORT BREPPlugin_ImportDriver : public GEOM_BaseDriver class BREPPlugin_ImportDriver : public GEOM_BaseDriver
{ {
public: public:
BREPPlugin_ImportDriver(); BREPPlugin_ImportDriver();

5
src/BREPPlugin/CMakeLists.txt
View File

@ -50,8 +50,13 @@ ENDIF()
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${CAS_DEFINITIONS}
${OMNIORB_DEFINITIONS}
) )
IF(WIN32)
ADD_DEFINITIONS(-DNOGDI)
ENDIF(WIN32)
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
ADD_DEFINITIONS( ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}

2
src/GEOMImpl/GEOMImpl_IBaseIEOperations.hxx
View File

@ -37,7 +37,7 @@ public:
Standard_EXPORT ~GEOMImpl_IBaseIEOperations(); Standard_EXPORT ~GEOMImpl_IBaseIEOperations();
protected: protected:
void MakeMaterialGroups(const Handle(GEOM_Object) &theObject, Standard_EXPORT void MakeMaterialGroups(const Handle(GEOM_Object) &theObject,
const Handle(TColStd_HSequenceOfTransient) &theSeq); const Handle(TColStd_HSequenceOfTransient) &theSeq);
Handle(GEOM_Object) MakeGroup Handle(GEOM_Object) MakeGroup

4
src/GEOMImpl/GEOMImpl_IECallBack.hxx
View File

@ -53,12 +53,12 @@ class GEOMImpl_IECallBack
const TCollection_AsciiString& theFormatName, const TCollection_AsciiString& theFormatName,
const TCollection_AsciiString& theParameterName ); const TCollection_AsciiString& theParameterName );
static void Register( const TCollection_AsciiString& theFormatName, GEOMImpl_IECallBack* theCallBack ); Standard_EXPORT static void Register( const TCollection_AsciiString& theFormatName, GEOMImpl_IECallBack* theCallBack );
static GEOMImpl_IECallBack* GetCallBack( const TCollection_AsciiString& theFormatName ); static GEOMImpl_IECallBack* GetCallBack( const TCollection_AsciiString& theFormatName );
protected: protected:
GEOMImpl_Gen* GetEngine(); Standard_EXPORT GEOMImpl_Gen* GetEngine();
private: private:
static std::map<TCollection_AsciiString, GEOMImpl_IECallBack*> myCallBacks; static std::map<TCollection_AsciiString, GEOMImpl_IECallBack*> myCallBacks;

10
src/GEOMUtils/GEOMUtils_XmlHandler.hxx
View File

@ -17,18 +17,18 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
#include <libxml/parser.h>
#ifndef _GEOMUtils_XmlHandler_HXX_ #ifndef _GEOMUtils_XmlHandler_HXX_
#define _GEOMUtils_XmlHandler_HXX_ #define _GEOMUtils_XmlHandler_HXX_
#include <Standard_Macro.hxx>
#include <string> #include <string>
#include <list> #include <list>
namespace GEOMUtils namespace GEOMUtils
{ {
//! Plugin action data //! Plugin action data
struct ActionData struct Standard_EXPORT ActionData
{ {
std::string label; //!< unique ID std::string label; //!< unique ID
std::string icon; //!< icon std::string icon; //!< icon
@ -39,7 +39,7 @@ namespace GEOMUtils
}; };
//! Plugin data //! Plugin data
struct PluginData struct Standard_EXPORT PluginData
{ {
std::string name; //!< plugin name std::string name; //!< plugin name
std::string serverLib; //!< engine library std::string serverLib; //!< engine library
@ -50,7 +50,7 @@ namespace GEOMUtils
//! Plugins information //! Plugins information
typedef std::list<PluginData> PluginInfo; typedef std::list<PluginData> PluginInfo;
PluginInfo ReadPluginInfo(); Standard_EXPORT PluginInfo ReadPluginInfo();
} }
#endif // _GEOMUtils_XmlHandler_HXX_ #endif // _GEOMUtils_XmlHandler_HXX_

5
src/IGESPlugin/CMakeLists.txt
View File

@ -50,8 +50,13 @@ ENDIF()
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${CAS_DEFINITIONS}
${OMNIORB_DEFINITIONS}
) )
IF(WIN32)
ADD_DEFINITIONS(-DNOGDI)
ENDIF(WIN32)
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
ADD_DEFINITIONS( ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}

2
src/IGESPlugin/IGESPlugin_Engine.hxx
View File

@ -21,7 +21,7 @@
#define _GEOM_IGESPLUGIN_ENGINE_HXX_ #define _GEOM_IGESPLUGIN_ENGINE_HXX_
#ifdef WIN32 #ifdef WIN32
#if defined IGESPLUGINENGINE_EXPORTS || defined IGESPLUGINENGINE_EXPORTS #if defined IGESPluginEngine_EXPORTS
#define IGESPLUGINENGINE_EXPORT __declspec( dllexport ) #define IGESPLUGINENGINE_EXPORT __declspec( dllexport )
#else #else
#define IGESPLUGINENGINE_EXPORT __declspec( dllimport ) #define IGESPLUGINENGINE_EXPORT __declspec( dllimport )

5
src/IGESPlugin/IGESPlugin_ExportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _IGESPlugin_ExportDriver_HXX #ifndef _IGESPlugin_ExportDriver_HXX
#define _IGESPlugin_ExportDriver_HXX #define _IGESPlugin_ExportDriver_HXX
// internal includes
#include "IGESPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver );
class IGESPLUGINENGINE_EXPORT IGESPlugin_ExportDriver : public GEOM_BaseDriver class IGESPlugin_ExportDriver : public GEOM_BaseDriver
{ {
public: public:
IGESPlugin_ExportDriver(); IGESPlugin_ExportDriver();

5
src/IGESPlugin/IGESPlugin_ImportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _IGESPlugin_ImportDriver_HXX #ifndef _IGESPlugin_ImportDriver_HXX
#define _IGESPlugin_ImportDriver_HXX #define _IGESPlugin_ImportDriver_HXX
// internal includes
#include "IGESPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver );
class IGESPLUGINENGINE_EXPORT IGESPlugin_ImportDriver : public GEOM_BaseDriver class IGESPlugin_ImportDriver : public GEOM_BaseDriver
{ {
public: public:
IGESPlugin_ImportDriver(); IGESPlugin_ImportDriver();

6
src/STEPPlugin/CMakeLists.txt
View File

@ -50,8 +50,13 @@ ENDIF()
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${CAS_DEFINITIONS}
${OMNIORB_DEFINITIONS}
) )
IF(WIN32)
ADD_DEFINITIONS(-DNOGDI)
ENDIF(WIN32)
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
ADD_DEFINITIONS( ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}
@ -61,6 +66,7 @@ ENDIF()
# libraries to link to # libraries to link to
SET(_link_engine_LIBRARIES SET(_link_engine_LIBRARIES
${CAS_TKSTEP} ${CAS_TKSTEP}
${CAS_TKSTEPBase}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${KERNEL_OpUtil} ${KERNEL_OpUtil}
SalomeIDLGEOM SalomeIDLGEOM

5
src/STEPPlugin/STEPPlugin_ExportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _STEPPlugin_ExportDriver_HXX #ifndef _STEPPlugin_ExportDriver_HXX
#define _STEPPlugin_ExportDriver_HXX #define _STEPPlugin_ExportDriver_HXX
// internal includes
#include "STEPPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver );
class STEPPLUGINENGINE_EXPORT STEPPlugin_ExportDriver : public GEOM_BaseDriver class STEPPlugin_ExportDriver : public GEOM_BaseDriver
{ {
public: public:
STEPPlugin_ExportDriver(); STEPPlugin_ExportDriver();

5
src/STEPPlugin/STEPPlugin_ImportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _STEPPlugin_ImportDriver_HXX #ifndef _STEPPlugin_ImportDriver_HXX
#define _STEPPlugin_ImportDriver_HXX #define _STEPPlugin_ImportDriver_HXX
// internal includes
#include "STEPPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver );
class STEPPLUGINENGINE_EXPORT STEPPlugin_ImportDriver : public GEOM_BaseDriver class STEPPlugin_ImportDriver : public GEOM_BaseDriver
{ {
public: public:
STEPPlugin_ImportDriver(); STEPPlugin_ImportDriver();

5
src/STLPlugin/CMakeLists.txt
View File

@ -50,8 +50,13 @@ ENDIF()
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${CAS_DEFINITIONS}
${OMNIORB_DEFINITIONS}
) )
IF(WIN32)
ADD_DEFINITIONS(-DNOGDI)
ENDIF(WIN32)
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
ADD_DEFINITIONS( ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}

5
src/STLPlugin/STLPlugin_ExportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _STLPlugin_ExportDriver_HXX #ifndef _STLPlugin_ExportDriver_HXX
#define _STLPlugin_ExportDriver_HXX #define _STLPlugin_ExportDriver_HXX
// internal includes
#include "STLPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver );
class STLPLUGINENGINE_EXPORT STLPlugin_ExportDriver : public GEOM_BaseDriver class STLPlugin_ExportDriver : public GEOM_BaseDriver
{ {
public: public:
STLPlugin_ExportDriver(); STLPlugin_ExportDriver();

5
src/STLPlugin/STLPlugin_ImportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _STLPlugin_ImportDriver_HXX #ifndef _STLPlugin_ImportDriver_HXX
#define _STLPlugin_ImportDriver_HXX #define _STLPlugin_ImportDriver_HXX
// internal includes
#include "STLPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver );
class STLPLUGINENGINE_EXPORT STLPlugin_ImportDriver : public GEOM_BaseDriver class STLPlugin_ImportDriver : public GEOM_BaseDriver
{ {
public: public:
STLPlugin_ImportDriver(); STLPlugin_ImportDriver();

5
src/VTKPlugin/CMakeLists.txt
View File

@ -52,8 +52,13 @@ ENDIF()
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${CAS_DEFINITIONS}
${OMNIORB_DEFINITIONS}
) )
IF(WIN32)
ADD_DEFINITIONS(-DNOGDI)
ENDIF(WIN32)
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
ADD_DEFINITIONS( ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}

5
src/VTKPlugin/VTKPlugin_ExportDriver.hxx
View File

@ -20,9 +20,6 @@
#ifndef _VTKPlugin_ExportDriver_HXX #ifndef _VTKPlugin_ExportDriver_HXX
#define _VTKPlugin_ExportDriver_HXX #define _VTKPlugin_ExportDriver_HXX
// internal includes
#include "VTKPlugin_Engine.hxx"
// GEOM includes // GEOM includes
#include "GEOM_BaseDriver.hxx" #include "GEOM_BaseDriver.hxx"
@ -31,7 +28,7 @@
DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver ); DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver );
class VTKPLUGINENGINE_EXPORT VTKPlugin_ExportDriver : public GEOM_BaseDriver class VTKPlugin_ExportDriver : public GEOM_BaseDriver
{ {
public: public:
VTKPlugin_ExportDriver(); VTKPlugin_ExportDriver();

5
src/XAOPlugin/CMakeLists.txt
View File

@ -52,8 +52,13 @@ ENDIF()
# additional preprocessor / compiler flags # additional preprocessor / compiler flags
ADD_DEFINITIONS( ADD_DEFINITIONS(
${CAS_DEFINITIONS} ${CAS_DEFINITIONS}
${OMNIORB_DEFINITIONS}
) )
IF(WIN32)
ADD_DEFINITIONS(-DNOGDI)
ENDIF(WIN32)
IF(SALOME_BUILD_GUI) IF(SALOME_BUILD_GUI)
ADD_DEFINITIONS( ADD_DEFINITIONS(
${QT_DEFINITIONS} ${QT_DEFINITIONS}

5
src/XAOPlugin/XAOPlugin_Driver.hxx
View File

@ -23,15 +23,12 @@
#ifndef _XAOPlugin_Driver_HXX #ifndef _XAOPlugin_Driver_HXX
#define _XAOPlugin_Driver_HXX #define _XAOPlugin_Driver_HXX
// internal includes
#include "XAOPlugin_Engine.hxx"
// OCCT includes // OCCT includes
#include <TFunction_Driver.hxx> #include <TFunction_Driver.hxx>
DEFINE_STANDARD_HANDLE(XAOPlugin_Driver, TFunction_Driver); DEFINE_STANDARD_HANDLE(XAOPlugin_Driver, TFunction_Driver);
class XAOPLUGINENGINE_EXPORT XAOPlugin_Driver: public TFunction_Driver class XAOPlugin_Driver: public TFunction_Driver
{ {
public: public:
XAOPlugin_Driver(); XAOPlugin_Driver();