Windows compatibility for V8_2_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0e9d937dee90e53e7b01d1ac5c6d546c9f4f5cb..cc9c953d976180070d26be9526879ea30785c0af 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================

diff --git a/src/MEDCalc/cmp/MED.hxx b/src/MEDCalc/cmp/MED.hxx
index 115e9e2680ff599739f8299cb80d6801bf5b772d..790b2f1a9d2e7947adac2472741676528f7e8feb 100644 (file)
--- a/src/MEDCalc/cmp/MED.hxx
+++ b/src/MEDCalc/cmp/MED.hxx
@@ -20,16 +20,6 @@
 #ifndef _MED_HXX_
 #define _MED_HXX_
 
-#ifdef WIN32
-# if defined MEDENGINE_EXPORTS || defined MEDEngine_EXPORTS
-#  define MEDENGINE_EXPORT __declspec( dllexport )
-# else
-#  define MEDENGINE_EXPORT __declspec( dllimport )
-# endif
-#else
-# define MEDENGINE_EXPORT
-#endif
-
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(MED_Gen)
 #include CORBA_SERVER_HEADER(MEDDataManager)
@@ -40,7 +30,9 @@
 #include <map>
 #include <string>
 
-class MEDENGINE_EXPORT MED :
+#include "MEDCALC.hxx"
+
+class MEDCALC_EXPORT MED :
   public POA_MED_ORB::MED_Gen,
   public Engines_Component_i
 {
@@ -99,7 +91,7 @@ public:
 };
 
 extern "C"
-MEDENGINE_EXPORT
+MEDCALC_EXPORT
 PortableServer::ObjectId* MEDEngine_factory( CORBA::ORB_ptr orb,
                                              PortableServer::POA_ptr poa,
                                              PortableServer::ObjectId* contId,

diff --git a/src/MEDCalc/cmp/MEDCALC.hxx b/src/MEDCalc/cmp/MEDCALC.hxx
index 3d716f0154bcbad5035f38a8761714723699be91..dca83c706311729370fae91246c4cff49f5d2afe 100644 (file)
--- a/src/MEDCalc/cmp/MEDCALC.hxx
+++ b/src/MEDCalc/cmp/MEDCALC.hxx
@@ -21,7 +21,7 @@
 #define __MEDCALC_HXX__
 
 #ifdef WIN32
-# if defined MEDFactoryEngine_EXPORTS || defined MEDEngine_EXPORTS
+# if defined MEDFactoryEngine_EXPORTS || defined MEDEngine_EXPORTS || defined MEDEngineCommon_EXPORTS
 #    define MEDCALC_EXPORT __declspec( dllexport )
 #  else
 #    define MEDCALC_EXPORT __declspec( dllimport )

diff --git a/src/MEDCalc/cmp/MEDCalculator_i.hxx b/src/MEDCalc/cmp/MEDCalculator_i.hxx
index 1b43d1ab621514a3d4941dd0bed7ed5986b5a30c..b0e9be8ef00c88c1c121ac49d214733c3baff207 100644 (file)
--- a/src/MEDCalc/cmp/MEDCalculator_i.hxx
+++ b/src/MEDCalc/cmp/MEDCalculator_i.hxx
@@ -56,7 +56,7 @@ public:
   // Other public functions (non available via CORBA)
   // ===========================================================
   //
-  static MEDCalculator_i * getInstance();
+  MEDCALC_EXPORT static MEDCalculator_i * getInstance();
 
 private:
   MEDCalculator_i();

diff --git a/src/MEDCalc/cmp/MEDCommandsHistoryManager_i.hxx b/src/MEDCalc/cmp/MEDCommandsHistoryManager_i.hxx
index 279355317ea0aed993e56ce03acbfba8542a075a..d607881262e2424f3ef41d16781e99455c5859e6 100644 (file)
--- a/src/MEDCalc/cmp/MEDCommandsHistoryManager_i.hxx
+++ b/src/MEDCalc/cmp/MEDCommandsHistoryManager_i.hxx
@@ -31,7 +31,7 @@ class MEDCommandsHistoryManager_i
     public SALOME::GenericObj_i
 {
  public:
-  static MEDCommandsHistoryManager_i* getInstance();
+  MEDCALC_EXPORT static MEDCommandsHistoryManager_i* getInstance();
 
   MEDCALC_EXPORT void addCommand(const char* command);
   MEDCALC_EXPORT MEDCALC::CommandsList* getCommandsHistory();

diff --git a/src/MEDCalc/cmp/MEDPresentationManager_i.hxx b/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
index cc2ae289eab3fdb3f22a466eb8a3ae0d7aacd359..e33f018c84ab7bfdd26bda643720833e2e6b1fff 100644 (file)
--- a/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
+++ b/src/MEDCalc/cmp/MEDPresentationManager_i.hxx
@@ -37,7 +37,7 @@ class MEDPresentationManager_i: public POA_MEDCALC::MEDPresentationManager,
 {
  public:
 
-  static MEDPresentationManager_i* getInstance();
+  MEDCALC_EXPORT static MEDPresentationManager_i* getInstance();
 
   MEDCALC_EXPORT MEDPresentation::TypeID makeMeshView(const MEDCALC::MeshViewParameters&, const MEDCALC::ViewModeType);
   MEDCALC_EXPORT MEDPresentation::TypeID makeScalarMap(const MEDCALC::ScalarMapParameters&, const MEDCALC::ViewModeType);