Win32 compatibility

diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx
index f35b2811a066a0407dde6c1263daa9f50fc3d8d0..9bda25fc404de2c1bd8640b3432e49f949b18320 100644 (file)
--- 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 <TFunction_Driver.hxx>
@@ -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 cba5d14920dde22c0dfe81d780d861b16552f8bc..68e6c254e33d0e258f386fa4075266c66c9f7190 100644 (file)
--- 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 fd5f28bece54871c13f697f01296ce98c6118174..2e2015fe1f435d4af8467d3cd2da1d4db2cad148 100644 (file)
--- 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 <TFunction_Logbook.hxx>
@@ -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 e37624924820b87b2ae8a39995bbe36c120818d0..3dde5d56b2395d861f2138d27f0dde919eb06448 100755 (executable)
--- 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 fbd7dd8f5ff4f2f89a29b0fbc30ec4058934a131..00c6dbdf321813ad99767b585bef5349801de89c 100644 (file)
--- 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 1f043659bdc93c08056cac1db382c223789b1128..e6a2940d01f90201cb7d94467c7a7cbc8219196f 100644 (file)
--- 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 b9e443dc856e080f8478ab1aaf9e550c7541f8f4..34a88046bf688004fc536da99bb5974b8143dc09 100644 (file)
--- 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 c5c751b32e1ceca599aa1071603524cae005080a..e547cb3edeaf8fe628be9048007f27a60b0f84da 100644 (file)
--- 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 890e879d2ff3a47d1e6bd9d1eabc7f103d5495be..a6c26b7e014aa5973d4fd900a586247daf54b7aa 100644 (file)
--- 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<TCollection_AsciiString, GEOMImpl_IECallBack*> myCallBacks;

diff --git a/src/GEOMUtils/GEOMUtils_XmlHandler.hxx b/src/GEOMUtils/GEOMUtils_XmlHandler.hxx
index e5952cff056570e7578508e32d263d55c9a76bbb..4617fe7f7683211c9e70aba0aea347a906881ac1 100644 (file)
--- 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 <libxml/parser.h>
-
 #ifndef _GEOMUtils_XmlHandler_HXX_
 #define _GEOMUtils_XmlHandler_HXX_
 
+#include <Standard_Macro.hxx>
+
 #include <string>
 #include <list>
 
 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<PluginData> PluginInfo;
 
-  PluginInfo ReadPluginInfo();
+  Standard_EXPORT PluginInfo ReadPluginInfo();
 }
 
 #endif // _GEOMUtils_XmlHandler_HXX_

diff --git a/src/IGESPlugin/CMakeLists.txt b/src/IGESPlugin/CMakeLists.txt
index caa22970476738f09f50f995d7301973f3292b4a..ee240841dfec6bc3fc861f5f0bcec56c14d0e075 100644 (file)
--- 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 5d01abe8c300d57511ac338f7b6142f5e1fd91b3..cb20e5463d4696a5bde441b4834b0b8c5041a9c9 100755 (executable)
--- 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 353324deb7c2375a2388939cb3e05e445168baa0..53d9be6c594a03c0356bea33e4003412630d1bbc 100644 (file)
--- 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 2ab850f85335d0996b29b82565e6c520f2cfd305..0b12fa8141cf9bcfa78ab132eab30c1c13e9f583 100644 (file)
--- 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 71c1097dc0a442a5e594ebf8a321a3cdf0004e98..4d4db727c9f933a741f2d829adb5c068af243402 100644 (file)
--- 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 000226491399bba98278ce35f5b2e216ebfca6e2..bf2acb8739aca82567737941da30f2dd058e5e35 100644 (file)
--- 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 a8c2b0cf0ddfee151b9db97c47528543a5fe1e18..40bb7b1be985cc6ca6ab488f2414b9fcd0e97f12 100644 (file)
--- 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 0b9420c3fde1254d9c243c7362d0879b1821d43c..b4688f6b1b4eed8c8159c97457cfef8d6162bc16 100644 (file)
--- 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 4726a16d32934d890f0b1da4e7f1df0107f47517..90eef7fb4e89641cf0bc711ae93aba7ce3ec5457 100644 (file)
--- 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 8373e59d7f06662a4722c443d2fbff0d6ffe3def..fb695b844f78546f73e07e6267637868984e2fa0 100644 (file)
--- 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 427a48d4943be0ffef9a711bfb1abc3adab3de58..d14424afe52bbc71a81218e7d15463dfb72e3ee3 100644 (file)
--- 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 cc055b9d93f965ef846852271d494ddc8ea753aa..b147c97d0a51ed1c8480cb7728994c3ffa0054f9 100644 (file)
--- 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 7d24c4345c6d530456c098b8f5c5611eeb1e9e6d..910c45b9ca2dc75bdcbfbd7f9651448c451f62c4 100644 (file)
--- 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 855b533d1f913600f400ff82d15d0bda62476ea6..ea821cf3b5f360c29feec39d284a68dcd80b97fb 100644 (file)
--- 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 <TFunction_Driver.hxx>
 
 DEFINE_STANDARD_HANDLE(XAOPlugin_Driver, TFunction_Driver);
 
-class XAOPLUGINENGINE_EXPORT XAOPlugin_Driver: public TFunction_Driver
+class XAOPlugin_Driver: public TFunction_Driver
 {
 public:
   XAOPlugin_Driver();