From 76d199bd790d9c34fc847cfbc5d9950e7e1a32c8 Mon Sep 17 00:00:00 2001 From: ana Date: Tue, 23 Sep 2014 15:48:25 +0400 Subject: [PATCH] Win32 compatibility --- .../AdvancedEngine_DividedDiskDriver.hxx | 4 +--- src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx | 4 +--- .../AdvancedEngine_SmoothingSurfaceDriver.hxx | 4 +--- src/BREPPlugin/BREPPlugin_Engine.hxx | 2 +- src/BREPPlugin/BREPPlugin_ExportDriver.hxx | 5 +---- src/BREPPlugin/BREPPlugin_ImportDriver.hxx | 5 +---- src/BREPPlugin/CMakeLists.txt | 5 +++++ src/GEOMImpl/GEOMImpl_IBaseIEOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IECallBack.hxx | 4 ++-- src/GEOMUtils/GEOMUtils_XmlHandler.hxx | 10 +++++----- src/IGESPlugin/CMakeLists.txt | 5 +++++ src/IGESPlugin/IGESPlugin_Engine.hxx | 2 +- src/IGESPlugin/IGESPlugin_ExportDriver.hxx | 5 +---- src/IGESPlugin/IGESPlugin_ImportDriver.hxx | 5 +---- src/STEPPlugin/CMakeLists.txt | 8 +++++++- src/STEPPlugin/STEPPlugin_ExportDriver.hxx | 5 +---- src/STEPPlugin/STEPPlugin_ImportDriver.hxx | 5 +---- src/STLPlugin/CMakeLists.txt | 5 +++++ src/STLPlugin/STLPlugin_ExportDriver.hxx | 5 +---- src/STLPlugin/STLPlugin_ImportDriver.hxx | 5 +---- src/VTKPlugin/CMakeLists.txt | 7 ++++++- src/VTKPlugin/VTKPlugin_ExportDriver.hxx | 5 +---- src/XAOPlugin/CMakeLists.txt | 5 +++++ src/XAOPlugin/XAOPlugin_Driver.hxx | 5 +---- 24 files changed, 56 insertions(+), 61 deletions(-) diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx index f35b2811a..9bda25fc4 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx @@ -23,8 +23,6 @@ #ifndef _AdvancedEngine_DividedDiskDriver_HXX #define _AdvancedEngine_DividedDiskDriver_HXX -#include "AdvancedEngine.hxx" - #include "GEOM_BaseDriver.hxx" #include @@ -37,7 +35,7 @@ class gp_Ax3; DEFINE_STANDARD_HANDLE( AdvancedEngine_DividedDiskDriver, GEOM_BaseDriver ); -class ADVANCEDENGINE_EXPORT AdvancedEngine_DividedDiskDriver : public GEOM_BaseDriver +class AdvancedEngine_DividedDiskDriver : public GEOM_BaseDriver { public: // Methods PUBLIC diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx index cba5d1492..68e6c254e 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx @@ -20,8 +20,6 @@ #ifndef _AdvancedEngine_PipeTShapeDriver_HXX #define _AdvancedEngine_PipeTShapeDriver_HXX -#include "AdvancedEngine.hxx" - #include "GEOM_BaseDriver.hxx" #include "GEOMAlgo_State.hxx" @@ -32,7 +30,7 @@ DEFINE_STANDARD_HANDLE( AdvancedEngine_PipeTShapeDriver, GEOM_BaseDriver ); -class ADVANCEDENGINE_EXPORT AdvancedEngine_PipeTShapeDriver : public GEOM_BaseDriver +class AdvancedEngine_PipeTShapeDriver : public GEOM_BaseDriver { public: // Methods PUBLIC diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx index fd5f28bec..2e2015fe1 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx @@ -20,8 +20,6 @@ #ifndef _AdvancedEngine_SmoothingSurfaceDriver_HXX #define _AdvancedEngine_SmoothingSurfaceDriver_HXX -#include "AdvancedEngine.hxx" - #include "GEOM_BaseDriver.hxx" #include @@ -30,7 +28,7 @@ DEFINE_STANDARD_HANDLE( AdvancedEngine_SmoothingSurfaceDriver, GEOM_BaseDriver ); -class ADVANCEDENGINE_EXPORT AdvancedEngine_SmoothingSurfaceDriver : public GEOM_BaseDriver +class AdvancedEngine_SmoothingSurfaceDriver : public GEOM_BaseDriver { public: // Methods PUBLIC diff --git a/src/BREPPlugin/BREPPlugin_Engine.hxx b/src/BREPPlugin/BREPPlugin_Engine.hxx index e37624924..3dde5d56b 100755 --- a/src/BREPPlugin/BREPPlugin_Engine.hxx +++ b/src/BREPPlugin/BREPPlugin_Engine.hxx @@ -21,7 +21,7 @@ #define _BREPPLUGIN_ENGINE_HXX_ #ifdef WIN32 - #if defined BREPPLUGINENGINE_EXPORTS || defined BREPPLUGINENGINE_EXPORTS + #if defined BREPPluginEngine_EXPORTS #define BREPPLUGINENGINE_EXPORT __declspec( dllexport ) #else #define BREPPLUGINENGINE_EXPORT __declspec( dllimport ) diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx index fbd7dd8f5..00c6dbdf3 100644 --- a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _BREPPlugin_ExportDriver_HXX #define _BREPPlugin_ExportDriver_HXX -// internal includes -#include "BREPPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver ); -class BREPPLUGINENGINE_EXPORT BREPPlugin_ExportDriver : public GEOM_BaseDriver +class BREPPlugin_ExportDriver : public GEOM_BaseDriver { public: BREPPlugin_ExportDriver(); diff --git a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx index 1f043659b..e6a2940d0 100644 --- a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _BREPPlugin_ImportDriver_HXX #define _BREPPlugin_ImportDriver_HXX -// internal includes -#include "BREPPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver ); -class BREPPLUGINENGINE_EXPORT BREPPlugin_ImportDriver : public GEOM_BaseDriver +class BREPPlugin_ImportDriver : public GEOM_BaseDriver { public: BREPPlugin_ImportDriver(); diff --git a/src/BREPPlugin/CMakeLists.txt b/src/BREPPlugin/CMakeLists.txt index b9e443dc8..34a88046b 100644 --- a/src/BREPPlugin/CMakeLists.txt +++ b/src/BREPPlugin/CMakeLists.txt @@ -50,8 +50,13 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) + IF(SALOME_BUILD_GUI) ADD_DEFINITIONS( ${QT_DEFINITIONS} diff --git a/src/GEOMImpl/GEOMImpl_IBaseIEOperations.hxx b/src/GEOMImpl/GEOMImpl_IBaseIEOperations.hxx index c5c751b32..e547cb3ed 100644 --- a/src/GEOMImpl/GEOMImpl_IBaseIEOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBaseIEOperations.hxx @@ -37,7 +37,7 @@ public: Standard_EXPORT ~GEOMImpl_IBaseIEOperations(); protected: - void MakeMaterialGroups(const Handle(GEOM_Object) &theObject, + Standard_EXPORT void MakeMaterialGroups(const Handle(GEOM_Object) &theObject, const Handle(TColStd_HSequenceOfTransient) &theSeq); Handle(GEOM_Object) MakeGroup diff --git a/src/GEOMImpl/GEOMImpl_IECallBack.hxx b/src/GEOMImpl/GEOMImpl_IECallBack.hxx index 890e879d2..a6c26b7e0 100644 --- a/src/GEOMImpl/GEOMImpl_IECallBack.hxx +++ b/src/GEOMImpl/GEOMImpl_IECallBack.hxx @@ -53,12 +53,12 @@ class GEOMImpl_IECallBack const TCollection_AsciiString& theFormatName, 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 ); protected: - GEOMImpl_Gen* GetEngine(); + Standard_EXPORT GEOMImpl_Gen* GetEngine(); private: static std::map myCallBacks; diff --git a/src/GEOMUtils/GEOMUtils_XmlHandler.hxx b/src/GEOMUtils/GEOMUtils_XmlHandler.hxx index e5952cff0..4617fe7f7 100644 --- a/src/GEOMUtils/GEOMUtils_XmlHandler.hxx +++ b/src/GEOMUtils/GEOMUtils_XmlHandler.hxx @@ -17,18 +17,18 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include - #ifndef _GEOMUtils_XmlHandler_HXX_ #define _GEOMUtils_XmlHandler_HXX_ +#include + #include #include namespace GEOMUtils { //! Plugin action data - struct ActionData + struct Standard_EXPORT ActionData { std::string label; //!< unique ID std::string icon; //!< icon @@ -39,7 +39,7 @@ namespace GEOMUtils }; //! Plugin data - struct PluginData + struct Standard_EXPORT PluginData { std::string name; //!< plugin name std::string serverLib; //!< engine library @@ -50,7 +50,7 @@ namespace GEOMUtils //! Plugins information typedef std::list PluginInfo; - PluginInfo ReadPluginInfo(); + Standard_EXPORT PluginInfo ReadPluginInfo(); } #endif // _GEOMUtils_XmlHandler_HXX_ diff --git a/src/IGESPlugin/CMakeLists.txt b/src/IGESPlugin/CMakeLists.txt index caa229704..ee240841d 100644 --- a/src/IGESPlugin/CMakeLists.txt +++ b/src/IGESPlugin/CMakeLists.txt @@ -50,8 +50,13 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) + IF(SALOME_BUILD_GUI) ADD_DEFINITIONS( ${QT_DEFINITIONS} diff --git a/src/IGESPlugin/IGESPlugin_Engine.hxx b/src/IGESPlugin/IGESPlugin_Engine.hxx index 5d01abe8c..cb20e5463 100755 --- a/src/IGESPlugin/IGESPlugin_Engine.hxx +++ b/src/IGESPlugin/IGESPlugin_Engine.hxx @@ -21,7 +21,7 @@ #define _GEOM_IGESPLUGIN_ENGINE_HXX_ #ifdef WIN32 - #if defined IGESPLUGINENGINE_EXPORTS || defined IGESPLUGINENGINE_EXPORTS + #if defined IGESPluginEngine_EXPORTS #define IGESPLUGINENGINE_EXPORT __declspec( dllexport ) #else #define IGESPLUGINENGINE_EXPORT __declspec( dllimport ) diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx index 353324deb..53d9be6c5 100644 --- a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _IGESPlugin_ExportDriver_HXX #define _IGESPlugin_ExportDriver_HXX -// internal includes -#include "IGESPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver ); -class IGESPLUGINENGINE_EXPORT IGESPlugin_ExportDriver : public GEOM_BaseDriver +class IGESPlugin_ExportDriver : public GEOM_BaseDriver { public: IGESPlugin_ExportDriver(); diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx index 2ab850f85..0b12fa814 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _IGESPlugin_ImportDriver_HXX #define _IGESPlugin_ImportDriver_HXX -// internal includes -#include "IGESPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver ); -class IGESPLUGINENGINE_EXPORT IGESPlugin_ImportDriver : public GEOM_BaseDriver +class IGESPlugin_ImportDriver : public GEOM_BaseDriver { public: IGESPlugin_ImportDriver(); diff --git a/src/STEPPlugin/CMakeLists.txt b/src/STEPPlugin/CMakeLists.txt index 71c1097dc..4d4db727c 100644 --- a/src/STEPPlugin/CMakeLists.txt +++ b/src/STEPPlugin/CMakeLists.txt @@ -50,8 +50,13 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} ) - + +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) + IF(SALOME_BUILD_GUI) ADD_DEFINITIONS( ${QT_DEFINITIONS} @@ -61,6 +66,7 @@ ENDIF() # libraries to link to SET(_link_engine_LIBRARIES ${CAS_TKSTEP} + ${CAS_TKSTEPBase} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} SalomeIDLGEOM diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx index 000226491..bf2acb873 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _STEPPlugin_ExportDriver_HXX #define _STEPPlugin_ExportDriver_HXX -// internal includes -#include "STEPPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver ); -class STEPPLUGINENGINE_EXPORT STEPPlugin_ExportDriver : public GEOM_BaseDriver +class STEPPlugin_ExportDriver : public GEOM_BaseDriver { public: STEPPlugin_ExportDriver(); diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx index a8c2b0cf0..40bb7b1be 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _STEPPlugin_ImportDriver_HXX #define _STEPPlugin_ImportDriver_HXX -// internal includes -#include "STEPPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver ); -class STEPPLUGINENGINE_EXPORT STEPPlugin_ImportDriver : public GEOM_BaseDriver +class STEPPlugin_ImportDriver : public GEOM_BaseDriver { public: STEPPlugin_ImportDriver(); diff --git a/src/STLPlugin/CMakeLists.txt b/src/STLPlugin/CMakeLists.txt index 0b9420c3f..b4688f6b1 100644 --- a/src/STLPlugin/CMakeLists.txt +++ b/src/STLPlugin/CMakeLists.txt @@ -50,8 +50,13 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) + IF(SALOME_BUILD_GUI) ADD_DEFINITIONS( ${QT_DEFINITIONS} diff --git a/src/STLPlugin/STLPlugin_ExportDriver.hxx b/src/STLPlugin/STLPlugin_ExportDriver.hxx index 4726a16d3..90eef7fb4 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _STLPlugin_ExportDriver_HXX #define _STLPlugin_ExportDriver_HXX -// internal includes -#include "STLPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver ); -class STLPLUGINENGINE_EXPORT STLPlugin_ExportDriver : public GEOM_BaseDriver +class STLPlugin_ExportDriver : public GEOM_BaseDriver { public: STLPlugin_ExportDriver(); diff --git a/src/STLPlugin/STLPlugin_ImportDriver.hxx b/src/STLPlugin/STLPlugin_ImportDriver.hxx index 8373e59d7..fb695b844 100644 --- a/src/STLPlugin/STLPlugin_ImportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ImportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _STLPlugin_ImportDriver_HXX #define _STLPlugin_ImportDriver_HXX -// internal includes -#include "STLPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver ); -class STLPLUGINENGINE_EXPORT STLPlugin_ImportDriver : public GEOM_BaseDriver +class STLPlugin_ImportDriver : public GEOM_BaseDriver { public: STLPlugin_ImportDriver(); diff --git a/src/VTKPlugin/CMakeLists.txt b/src/VTKPlugin/CMakeLists.txt index 427a48d49..d14424afe 100644 --- a/src/VTKPlugin/CMakeLists.txt +++ b/src/VTKPlugin/CMakeLists.txt @@ -52,8 +52,13 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} ) - + +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) + IF(SALOME_BUILD_GUI) ADD_DEFINITIONS( ${QT_DEFINITIONS} diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx index cc055b9d9..b147c97d0 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx @@ -20,9 +20,6 @@ #ifndef _VTKPlugin_ExportDriver_HXX #define _VTKPlugin_ExportDriver_HXX -// internal includes -#include "VTKPlugin_Engine.hxx" - // GEOM includes #include "GEOM_BaseDriver.hxx" @@ -31,7 +28,7 @@ DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver ); -class VTKPLUGINENGINE_EXPORT VTKPlugin_ExportDriver : public GEOM_BaseDriver +class VTKPlugin_ExportDriver : public GEOM_BaseDriver { public: VTKPlugin_ExportDriver(); diff --git a/src/XAOPlugin/CMakeLists.txt b/src/XAOPlugin/CMakeLists.txt index 7d24c4345..910c45b9c 100644 --- a/src/XAOPlugin/CMakeLists.txt +++ b/src/XAOPlugin/CMakeLists.txt @@ -52,8 +52,13 @@ ENDIF() # additional preprocessor / compiler flags ADD_DEFINITIONS( ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} ) +IF(WIN32) + ADD_DEFINITIONS(-DNOGDI) +ENDIF(WIN32) + IF(SALOME_BUILD_GUI) ADD_DEFINITIONS( ${QT_DEFINITIONS} diff --git a/src/XAOPlugin/XAOPlugin_Driver.hxx b/src/XAOPlugin/XAOPlugin_Driver.hxx index 855b533d1..ea821cf3b 100644 --- a/src/XAOPlugin/XAOPlugin_Driver.hxx +++ b/src/XAOPlugin/XAOPlugin_Driver.hxx @@ -23,15 +23,12 @@ #ifndef _XAOPlugin_Driver_HXX #define _XAOPlugin_Driver_HXX -// internal includes -#include "XAOPlugin_Engine.hxx" - // OCCT includes #include DEFINE_STANDARD_HANDLE(XAOPlugin_Driver, TFunction_Driver); -class XAOPLUGINENGINE_EXPORT XAOPlugin_Driver: public TFunction_Driver +class XAOPlugin_Driver: public TFunction_Driver { public: XAOPlugin_Driver(); -- 2.39.2