Compilation under Windows.

diff --git a/src/SalomeApp/SalomeApp.h b/src/SalomeApp/SalomeApp.h
index b3180ce0f26b4c180ee64f1494cdf60c416ca3b4..bec190a834813b43dd0471ae6acf91b95d010367 100644 (file)
--- a/src/SalomeApp/SalomeApp.h
+++ b/src/SalomeApp/SalomeApp.h
@@ -38,8 +38,22 @@
 #define SALOMEAPP_EXPORT __declspec(dllimport)
 #endif
 
+#if defined SALOMEAPPIMPL_EXPORTS || defined SalomeAppImpl_EXPORTS
+#define SALOMEAPPIMPL_EXPORT __declspec(dllexport)
+#else
+#define SALOMEAPPIMPL_EXPORT __declspec(dllimport)
+#endif
+
+#if defined SALOMEAPPSL_EXPORTS || defined SalomeAppSL_EXPORTS
+#define SALOMEAPPSL_EXPORT __declspec(dllexport)
+#else
+#define SALOMEAPPSL_EXPORT __declspec(dllimport)
+#endif
+
 #else
 #define SALOMEAPP_EXPORT
+#define SALOMEAPPIMPL_EXPORT
+#define SALOMEAPPSL_EXPORT
 #endif               //WIN32
 
 #define APP_VERSION "0.1"

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index a29b67c21df1bf1dcfacddd90e8757df438e677e..eaa6b7bee136ca6f3147f9822378739791c614f3 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -64,7 +64,7 @@ class SALOME_LifeCycleCORBA;
   \brief Application containing SalomeApp module or LightApp module
 */
 
-class SALOMEAPP_EXPORT SalomeApp_Application : public LightApp_Application
+class SALOMEAPPIMPL_EXPORT SalomeApp_Application : public LightApp_Application
 {
   Q_OBJECT
 

diff --git a/src/SalomeApp/SalomeApp_Application_SL.h b/src/SalomeApp/SalomeApp_Application_SL.h
index 9d9b735ac72dfcb5cb7a129ca54a1120919d684a..c70c97b0b8d2505b22bcf8e0a74731cf3dd7749f 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application_SL.h
+++ b/src/SalomeApp/SalomeApp_Application_SL.h
@@ -21,7 +21,7 @@
 
 #include "SalomeApp_Application.h"
 
-class SALOMEAPP_EXPORT SalomeApp_Application_SL : public SalomeApp_Application
+class SALOMEAPPIMPL_EXPORT SalomeApp_Application_SL : public SalomeApp_Application
 {
 public:
   SalomeApp_Application_SL();

diff --git a/src/SalomeApp/SalomeApp_Application_SL_Entry.cxx b/src/SalomeApp/SalomeApp_Application_SL_Entry.cxx
index 9094003cd80b9f8956a3e1a4178c6c7d6ddbdda1..df068984a19ea19efdef92e904d079a75d6cffe3 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application_SL_Entry.cxx
+++ b/src/SalomeApp/SalomeApp_Application_SL_Entry.cxx
@@ -20,7 +20,7 @@
 #include "SalomeApp_Application_SL.h"
 
 /*!Create new instance of SalomeApp_Application.*/
-extern "C" SALOMEAPP_EXPORT SUIT_Application* createApplication()
+extern "C" SALOMEAPPSL_EXPORT SUIT_Application* createApplication()
 {
   return new SalomeApp_Application_SL;
 }

diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.h b/src/SalomeApp/SalomeApp_CheckFileDlg.h
index f47b1e920e4471f045170a6051da2ea150d26391..16dbe4705cc3903eb9bd62c09f347662ce8adf2c 100644 (file)
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.h
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.h
@@ -29,7 +29,7 @@
 
 class QCheckBox;
 
-class SALOMEAPP_EXPORT SalomeApp_CheckFileDlg : public SUIT_FileDlg
+class SALOMEAPPIMPL_EXPORT SalomeApp_CheckFileDlg : public SUIT_FileDlg
 {
   Q_OBJECT
     

diff --git a/src/SalomeApp/SalomeApp_DataModel.h b/src/SalomeApp/SalomeApp_DataModel.h
index 945b392232a826f6472307a6f701c74c0bc5768b..c572f277fef6b0f68457049a3194edfa1d0ddec6 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataModel.h
+++ b/src/SalomeApp/SalomeApp_DataModel.h
@@ -43,7 +43,7 @@ class LightApp_DataObject;
 
 //   Class       : SalomeApp_DataModel
 ///  Description : Base class of data model
-class SALOMEAPP_EXPORT SalomeApp_DataModel : public LightApp_DataModel
+class SALOMEAPPIMPL_EXPORT SalomeApp_DataModel : public LightApp_DataModel
 {
   Q_OBJECT
 

diff --git a/src/SalomeApp/SalomeApp_DataObject.h b/src/SalomeApp/SalomeApp_DataObject.h
index 9925ec384599022053a011bc0f36f7c4447ccb8f..f26d0ae1766bcc8ab0220d9ddd3c69484b30b6c1 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.h
+++ b/src/SalomeApp/SalomeApp_DataObject.h
@@ -32,7 +32,7 @@
 
 class SalomeApp_Study;
 
-class SALOMEAPP_EXPORT SalomeApp_DataObject : public virtual LightApp_DataObject
+class SALOMEAPPIMPL_EXPORT SalomeApp_DataObject : public virtual LightApp_DataObject
 {
 
 public:
@@ -85,7 +85,7 @@ private:
   _PTR(SObject)          myObject;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_ModuleObject : public SalomeApp_DataObject,
+class SALOMEAPPIMPL_EXPORT SalomeApp_ModuleObject : public SalomeApp_DataObject,
                                                 public CAM_ModuleObject
 {
 public:
@@ -99,7 +99,7 @@ public:
   QString                toolTip( const int = NameId ) const;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_RootObject : public SalomeApp_DataObject,
+class SALOMEAPPIMPL_EXPORT SalomeApp_RootObject : public SalomeApp_DataObject,
                                               public LightApp_RootObject
 {
 public:
@@ -118,7 +118,7 @@ protected:
   bool _toSynchronize;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_SavePointObject : public virtual LightApp_DataObject
+class SALOMEAPPIMPL_EXPORT SalomeApp_SavePointObject : public virtual LightApp_DataObject
 {
 public:
   SalomeApp_SavePointObject( SUIT_DataObject*, const int, SalomeApp_Study* );
@@ -137,7 +137,7 @@ private:
   SalomeApp_Study*       myStudy;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_SavePointRootObject : public SUIT_DataObject
+class SALOMEAPPIMPL_EXPORT SalomeApp_SavePointRootObject : public SUIT_DataObject
 {
 public:
   SalomeApp_SavePointRootObject( SUIT_DataObject* );

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
index ce1740451abf1f90d3699bbaad47b6deea4b8f78..f134f18fc81cc5706a5a80a2b36bfd240751a2fd 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
@@ -29,7 +29,7 @@
 
 #include <QValidator>
 
-class SALOMEAPP_EXPORT SalomeApp_DoubleSpinBox : public QtxDoubleSpinBox
+class SALOMEAPPIMPL_EXPORT SalomeApp_DoubleSpinBox : public QtxDoubleSpinBox
 {
   Q_OBJECT
 

diff --git a/src/SalomeApp/SalomeApp_Engine_i.h b/src/SalomeApp/SalomeApp_Engine_i.h
index 9de78b81089af0010c83dbfdea7bdfccd326bceb..148b5b61ca4fe4e68b797ee62f6c15fdb0a18f39 100644 (file)
--- a/src/SalomeApp/SalomeApp_Engine_i.h
+++ b/src/SalomeApp/SalomeApp_Engine_i.h
@@ -40,7 +40,7 @@
 
 class SALOME_NamingService_Abstract;
 
-class SALOMEAPP_EXPORT SalomeApp_Engine_i: public POA_SalomeApp::Engine,
+class SALOMEAPPIMPL_EXPORT SalomeApp_Engine_i: public POA_SalomeApp::Engine,
                                           public Engines_Component_i
 {
 public:

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index e9fa0f9af56aefd46718198ba665a99deda68b60..9f26608137092560aad5e64c2b157768bff9391d 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
@@ -98,7 +98,7 @@ bool SalomeApp_ExceptionHandler::handle( QObject* o, QEvent* e )
 }
 
 /*!Create new SUIT_ExceptionHandler*/
-extern "C" SALOMEAPP_EXPORT SUIT_ExceptionHandler* getExceptionHandler()
+extern "C" SALOMEAPPIMPL_EXPORT SUIT_ExceptionHandler* getExceptionHandler()
 {
   // MSV 2006-04-26: work around PAL12004 "VTK window => SIGFPE Arithmetic Exception Detected"
   // We disable FPE signal as it was in earlier versions of SALOME. It is enabled

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.h b/src/SalomeApp/SalomeApp_ExceptionHandler.h
index d7efdaa66798143d88a1ee57fa8329375aac5b6b..3799855f21a8b9a4c8e6e8b346bd86de6218e285 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.h
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.h
@@ -27,7 +27,7 @@
 
 #include <SUIT_ExceptionHandler.h>
 
-class SALOMEAPP_EXPORT SalomeApp_ExceptionHandler : public SUIT_ExceptionHandler
+class SALOMEAPPIMPL_EXPORT SalomeApp_ExceptionHandler : public SUIT_ExceptionHandler
 {
 public:
   SalomeApp_ExceptionHandler( const bool );

diff --git a/src/SalomeApp/SalomeApp_Filter.h b/src/SalomeApp/SalomeApp_Filter.h
index 2d71c054e4776c1f2aad86fd8dfa344d3facc5e1..786f73e0cb9f595fe01b0bc612ebd73b6a126bad 100644 (file)
--- a/src/SalomeApp/SalomeApp_Filter.h
+++ b/src/SalomeApp/SalomeApp_Filter.h
@@ -28,7 +28,7 @@
 
 class SalomeApp_Study;
 
-class SALOMEAPP_EXPORT SalomeApp_Filter: public SUIT_SelectionFilter
+class SALOMEAPPIMPL_EXPORT SalomeApp_Filter: public SUIT_SelectionFilter
 {
 public:
   SalomeApp_Filter(SalomeApp_Study* study);

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h
index a95fe65196b156cd38f1b1a1664ec634c82f66fc..637455a71f356b6af811bd3aabbcb7993c23c3f4 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.h
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.h
@@ -29,7 +29,7 @@
 
 #include <QValidator>
 
-class SALOMEAPP_EXPORT SalomeApp_IntSpinBox : public QtxIntSpinBox
+class SALOMEAPPIMPL_EXPORT SalomeApp_IntSpinBox : public QtxIntSpinBox
 {
   Q_OBJECT
 

diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
index b77fe5ec83885b9b37c6ac99e657cdcb7cab7ae3..b2045dad6fd3f098ba01f41ff95ce10018ebd533 100644 (file)
--- a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
+++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
@@ -28,7 +28,7 @@ class QListWidget;
 class QPushButton;
 class QStringList;
 
-class SALOMEAPP_EXPORT SalomeApp_LoadStudiesDlg : public QDialog
+class SALOMEAPPIMPL_EXPORT SalomeApp_LoadStudiesDlg : public QDialog
 { 
   Q_OBJECT
 

diff --git a/src/SalomeApp/SalomeApp_Module.h b/src/SalomeApp/SalomeApp_Module.h
index d2ab539198c4401aa9504f7963a4b507b3e3d4ed..4af525341b34f30d80878a7091e88fe878299992 100644 (file)
--- a/src/SalomeApp/SalomeApp_Module.h
+++ b/src/SalomeApp/SalomeApp_Module.h
@@ -41,7 +41,7 @@ class SUIT_DataObject;
 /*!
  * \brief Base class for all salome modules
  */
-class SALOMEAPP_EXPORT SalomeApp_Module : public LightApp_Module
+class SALOMEAPPIMPL_EXPORT SalomeApp_Module : public LightApp_Module
 {
   Q_OBJECT
 

diff --git a/src/SalomeApp/SalomeApp_NoteBook.h b/src/SalomeApp/SalomeApp_NoteBook.h
index 6658ae0259f171cb4e87e9b8b24622515bcb277a..aad9bd2381b246f80fe4d693ca04af2a2903bcc9 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBook.h
+++ b/src/SalomeApp/SalomeApp_NoteBook.h
@@ -52,7 +52,7 @@ struct NoteBoox_Variable
 
 typedef QMap< int, NoteBoox_Variable > VariableMap;
 
-class SALOMEAPP_EXPORT NoteBook_TableRow : public QWidget
+class SALOMEAPPIMPL_EXPORT NoteBook_TableRow : public QWidget
 {
  public:
   NoteBook_TableRow(int, NoteBook_Table* parentTable, QWidget* parent=0 );
@@ -88,7 +88,7 @@ class SALOMEAPP_EXPORT NoteBook_TableRow : public QWidget
   QTableWidgetItem* myVariableValue;
 };
 
-class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
+class SALOMEAPPIMPL_EXPORT NoteBook_Table : public QTableWidget
 {
   Q_OBJECT
  public:
@@ -138,7 +138,7 @@ class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
   VariableMap myVariableMap;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_NoteBook : public QWidget 
+class SALOMEAPPIMPL_EXPORT SalomeApp_NoteBook : public QWidget 
 {
   Q_OBJECT
  public:

diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h
index 4e6c0763fc1eda64c8f604613c4cb27b379cee58..52b394f420f16603a4f5e9ae61fac85c2f90bcb3 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.h
+++ b/src/SalomeApp/SalomeApp_Study.h
@@ -33,7 +33,7 @@
 
 #include "SALOMEDSClient.hxx"
 
-class SALOMEAPP_EXPORT SalomeApp_Study : public LightApp_Study
+class SALOMEAPPIMPL_EXPORT SalomeApp_Study : public LightApp_Study
 {
   Q_OBJECT
 

diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
index 81b27f2d1c1f7473042555b504e0a6461a10e401..27fd0a19a503c6ff0a8985d775381835f036476c 100644 (file)
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
@@ -44,7 +44,7 @@ class QTextEdit;
 class QTreeWidget;
 class QPushButton;
 
-class SALOMEAPP_EXPORT SalomeApp_StudyPropertiesDlg : public QDialog
+class SALOMEAPPIMPL_EXPORT SalomeApp_StudyPropertiesDlg : public QDialog
 { 
   Q_OBJECT
 public:

diff --git a/src/SalomeApp/SalomeApp_Tools.h b/src/SalomeApp/SalomeApp_Tools.h
index 3c485a2502545797f1603b1a1356da63b31060c2..8e476eb91df2876c2bb32dad6c1bc7a180218ed8 100644 (file)
--- a/src/SalomeApp/SalomeApp_Tools.h
+++ b/src/SalomeApp/SalomeApp_Tools.h
@@ -38,7 +38,7 @@ class Quantity_Color;
 /*! 
   Class which provide color converter and exception message box.
 */
-class SALOMEAPP_EXPORT SalomeApp_Tools : public SUIT_Tools
+class SALOMEAPPIMPL_EXPORT SalomeApp_Tools : public SUIT_Tools
 {
 public:
   static Quantity_Color  color( const QColor& );

diff --git a/src/SalomeApp/SalomeApp_TypeFilter.h b/src/SalomeApp/SalomeApp_TypeFilter.h
index b745b419106b457e9c963b61ae977ad510c7eb8c..539ad3acd7460c8096670d31a78026b7e2912de1 100644 (file)
--- a/src/SalomeApp/SalomeApp_TypeFilter.h
+++ b/src/SalomeApp/SalomeApp_TypeFilter.h
@@ -30,7 +30,7 @@
 /*!
   Class which provide data owner validation.
 */
-class SALOMEAPP_EXPORT SalomeApp_TypeFilter: public SalomeApp_Filter
+class SALOMEAPPIMPL_EXPORT SalomeApp_TypeFilter: public SalomeApp_Filter
 {
 public:
   SalomeApp_TypeFilter( SalomeApp_Study* study, const QString& kind );

diff --git a/src/SalomeApp/SalomeApp_VisualState.h b/src/SalomeApp/SalomeApp_VisualState.h
index c6f0af06bc61d8e90e2ecec6e060d824ebf199b1..80bfe6820fbe2c82b7c59bb338a7ca9cd158b641 100644 (file)
--- a/src/SalomeApp/SalomeApp_VisualState.h
+++ b/src/SalomeApp/SalomeApp_VisualState.h
@@ -33,7 +33,7 @@
 
 class SalomeApp_Application;
 
-class SALOMEAPP_EXPORT SalomeApp_VisualState: public QObject
+class SALOMEAPPIMPL_EXPORT SalomeApp_VisualState: public QObject
 {
 public:
   SalomeApp_VisualState( SalomeApp_Application* );

diff --git a/src/Session/Session_NS_wrapper.hxx b/src/Session/Session_NS_wrapper.hxx
index 85518aff0af49628146afe0ab4a91f3bcf10c88a..e7a62addaa86dd7f1013bba5fc9487cf957201c0 100644 (file)
--- a/src/Session/Session_NS_wrapper.hxx
+++ b/src/Session/Session_NS_wrapper.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include "SALOME_NamingService.hxx"
+#include "SALOME_Session.hxx"
 
 #include "omniORB4/CORBA.h"
 
@@ -28,7 +29,7 @@ class QWaitCondition;
 
 class Engines_Container_i;
 
-class OldStyleNS
+class SESSION_EXPORT OldStyleNS
 {
 public:
   using RealNS = SALOME_NamingService;
@@ -51,7 +52,7 @@ private:
 
 #include "SALOME_Fake_NamingService.hxx"
 
-class NewStyleNS
+class SESSION_EXPORT NewStyleNS
 {
 public:
   using RealNS = SALOME_Fake_NamingService;

diff --git a/src/Session/Session_Promises.hxx b/src/Session/Session_Promises.hxx
index be471593e868fe149b87772aabbdb11518438573..87c1414d01c748e869bbee8a12618cbf745f6986 100644 (file)
--- a/src/Session/Session_Promises.hxx
+++ b/src/Session/Session_Promises.hxx
@@ -21,7 +21,8 @@
 
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(SALOME_Session)
+#include "SALOME_Session.hxx"
 
 #include <future>
 
-std::promise<SALOME::Session_var> *GetSessionRefSingleton();
+SESSION_EXPORT std::promise<SALOME::Session_var> *GetSessionRefSingleton();