X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOME_PY%2FSalomePy.cxx;h=85286c91b0211948ad6d5b1f16b1d166b785e720;hb=034a705024b224972c148e1e3834c5ee38df184b;hp=c7ec622c751a96e7ec25b54b8b3ca1955182e9d9;hpb=209a8c074e9be0db8dcbce18bcbe1c5ac5ea988e;p=modules%2Fgui.git

diff --git a/src/SALOME_PY/SalomePy.cxx b/src/SALOME_PY/SalomePy.cxx
index c7ec622c7..85286c91b 100755
--- a/src/SALOME_PY/SalomePy.cxx
+++ b/src/SALOME_PY/SalomePy.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,7 +24,7 @@
 //  File   : SalomePy.cxx
 //  Author : Paul RASCLE, EDF
 //
-#ifdef WNT
+#ifdef WIN32
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...
@@ -76,6 +76,17 @@
   In case of any error these methods return None object to the Python.
 */
 
+#ifdef WIN32
+ #if defined SALOMEPY_EXPORTS || defined SalomePy_EXPORTS
+  #define SALOMEPY_EXPORT __declspec( dllexport )
+ #else
+  #define SALOMEPY_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define SALOMEPY_EXPORT
+#endif
+
+
 #define PUBLISH_ENUM(i)                              \
 {                                                    \
   PyObject *w;                                       \
@@ -198,7 +209,7 @@ static SVTK_ViewWindow* GetVTKViewWindow( int toCreate = __FindOrCreate ) {
   \return VTK window renderer object
 */
 
-class TGetRendererEvent: public SALOME_Event
+class SALOMEPY_EXPORT TGetRendererEvent: public SALOME_Event
 {
 public:
   typedef PyObject* TResult;
@@ -222,7 +233,7 @@ public:
   }
 };
 
-extern "C" PyObject* libSalomePy_getRenderer( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_getRenderer( PyObject* self, PyObject* args )
 {
   PyObject* aResult = Py_None;
   int toCreate = 0;
@@ -251,7 +262,7 @@ extern "C" PyObject* libSalomePy_getRenderer( PyObject* self, PyObject* args )
   \return VTK window render window object
 */
 
-class TGetRenderWindowEvent: public SALOME_Event
+class SALOMEPY_EXPORT TGetRenderWindowEvent: public SALOME_Event
 {
 public:
   typedef PyObject* TResult;
@@ -275,7 +286,7 @@ public:
   }
 };
 
-extern "C" PyObject* libSalomePy_getRenderWindow( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_getRenderWindow( PyObject* self, PyObject* args )
 {
   PyObject* aResult = Py_None;
   int toCreate = 0;
@@ -304,7 +315,7 @@ extern "C" PyObject* libSalomePy_getRenderWindow( PyObject* self, PyObject* args
   \return VTK window render window interactor object
 */
 
-class TGetRenderWindowInteractorEvent: public SALOME_Event
+class SALOMEPY_EXPORT TGetRenderWindowInteractorEvent: public SALOME_Event
 {
 public:
   typedef PyObject* TResult;
@@ -328,7 +339,7 @@ public:
   }
 };
 
-extern "C" PyObject* libSalomePy_getRenderWindowInteractor( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_getRenderWindowInteractor( PyObject* self, PyObject* args )
 {
   PyObject* aResult = Py_None;
   int toCreate = 0;
@@ -349,7 +360,7 @@ extern "C" PyObject* libSalomePy_getRenderWindowInteractor( PyObject* self, PyOb
   \return nothing (Py_None)
 */
 
-extern "C" PyObject* libSalomePy_showTrihedron( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_showTrihedron( PyObject* self, PyObject* args )
 {
   class TEvent: public SALOME_Event
   {
@@ -384,7 +395,7 @@ extern "C" PyObject* libSalomePy_showTrihedron( PyObject* self, PyObject* args )
   \return nothing (Py_None)
 */
 
-extern "C" PyObject* libSalomePy_fitAll( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_fitAll( PyObject* self, PyObject* args )
 {
   class TEvent: public SALOME_Event
   {
@@ -412,7 +423,7 @@ extern "C" PyObject* libSalomePy_fitAll( PyObject* self, PyObject* args )
   \return nothing (Py_None)
 */
 
-extern "C" PyObject* libSalomePy_setView( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_setView( PyObject* self, PyObject* args )
 {
   class TEvent: public SALOME_Event
   {
@@ -463,7 +474,7 @@ extern "C" PyObject* libSalomePy_setView( PyObject* self, PyObject* args )
   \return nothing (Py_None)
 */
 
-extern "C" PyObject* libSalomePy_resetView( PyObject* self, PyObject* args )
+extern "C" SALOMEPY_EXPORT PyObject* libSalomePy_resetView( PyObject* self, PyObject* args )
 {
   class TEvent: public SALOME_Event
   {
@@ -497,7 +508,7 @@ static PyMethodDef Module_Methods[] =
   \brief Python module initialization.
   \internal
 */
-extern "C" void initlibSalomePy()
+extern "C" SALOMEPY_EXPORT void initlibSalomePy()
 {
   static char* modulename = (char*)"libSalomePy";