windows port : rename export symbol SALOME_PYQT_EXPORT to SALOME_PYQT_LIGHT_EXPORT

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
index b5beead31bba5462630f725b212fea27bafee005..275c084d4f16b0e5084543017a371f53de78dc7e 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
@@ -35,7 +35,7 @@ class SALOME_PYQT_RootObjectLight;
 
 
 
-class SALOME_PYQT_EXPORT SALOME_PYQT_DataModelLight : public LightApp_DataModel
+class SALOME_PYQT_LIGHT_EXPORT SALOME_PYQT_DataModelLight : public LightApp_DataModel
 {
   Q_OBJECT
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
index 024feebfd2d1f052e81c2a7b43a8f36d59afc12a..a99e0212ab9945fde9c4f527d9ce78d379c3650b 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
@@ -36,7 +36,7 @@
 /*!
  * SALOME_PYQT_DataObjectLight - PYTHON LIGHT module's data object class
  */
-class SALOME_PYQT_EXPORT SALOME_PYQT_DataObjectLight : public virtual LightApp_DataObject
+class SALOME_PYQT_LIGHT_EXPORT SALOME_PYQT_DataObjectLight : public virtual LightApp_DataObject
 {
 
  public:

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h
index ada818fd70b8c22b02f647c7d12d041d5b389328..12ab128a48745b0c626f306e5e2beae40ca4bec9 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h
@@ -30,15 +30,15 @@
 // set dllexport type for Win platform 
 #ifdef WNT
 
-#ifdef SALOME_PYQT_EXPORTS
-#define SALOME_PYQT_EXPORT __declspec(dllexport)
+#if defined SALOME_PYQT_LIGHT_EXPORTS || defined SalomePyQtGUILight_EXPORTS
+#define SALOME_PYQT_LIGHT_EXPORT __declspec(dllexport)
 #else
-#define SALOME_PYQT_EXPORT __declspec(dllimport)
+#define SALOME_PYQT_LIGHT_EXPORT __declspec(dllimport)
 #endif
 
 #else   // WNT
 
-#define SALOME_PYQT_EXPORT
+#define SALOME_PYQT_LIGHT_EXPORT
 
 #endif  // WNT
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
index 10566bb505aae47a4d3515318668656b2e2036c1..e52a6780655e9e60b1fb2c5bedee7bac4458e77f 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
@@ -184,7 +184,7 @@ PyMODINIT_FUNC INIT_FUNCTION();
 */
 
 extern "C" {
-  SALOME_PYQT_EXPORT CAM_Module* createModule() {
+  SALOME_PYQT_LIGHT_EXPORT CAM_Module* createModule() {
 
     static bool alreadyInitialized = false;
     if ( !alreadyInitialized ) {

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
index e7e89fa8c5b9253926397481f976e38e41dc39df..972788f691f5ccb6c2c6fbf8cb88f4d4bff5cf60 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
@@ -46,7 +46,7 @@ class QtxActionGroup;
 class QMenu;
 
 
-class SALOME_PYQT_EXPORT SALOME_PYQT_ModuleLight: virtual public LightApp_Module
+class SALOME_PYQT_LIGHT_EXPORT SALOME_PYQT_ModuleLight: virtual public LightApp_Module
 {
   Q_OBJECT;
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h
index e49faabaa1f64f34b87c62dd77572a26a33d150a..dc99adcdac112e0a02c1ffbd3cf08b3ff5704297 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h
@@ -31,7 +31,7 @@
 
 #include "PyInterp_Interp.h" // this include must be first !!!
 
-class SALOME_PYQT_EXPORT SALOME_PYQT_PyInterp : public PyInterp_Interp
+class SALOME_PYQT_LIGHT_EXPORT SALOME_PYQT_PyInterp : public PyInterp_Interp
 {
  public:
   SALOME_PYQT_PyInterp();