New iteration with Anthony.

diff --git a/src/MEDCoupling/MEDCoupling.hxx b/src/MEDCoupling/MEDCoupling.hxx
index 5b6208fb314bfd7fd0f66b6410cb2d9418073804..391b9d378def0dbde3c208b76f11526510cfe66c 100644 (file)
--- a/src/MEDCoupling/MEDCoupling.hxx
+++ b/src/MEDCoupling/MEDCoupling.hxx
@@ -22,7 +22,7 @@
 #define _MEDCOUPLING_HXX_
 
 #ifdef WIN32
-#  if defined(medcoupling_EXPORTS) || defined(medcouplingcpp_EXPORTS)
+#  if defined(medcoupling_EXPORTS) || defined(medcouplingcpp_EXPORTS) || defined(MEDCOUPLING_WIN32_SWIG)
 #    define MEDCOUPLING_EXPORT __declspec( dllexport )
 #  else
 #    define MEDCOUPLING_EXPORT __declspec( dllimport )

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
index 7b572ab07982b88407d6541aa49f975917a039ea..d3ac9fa3d62e06355e9a82ca2060a8283d77166f 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx
@@ -23,8 +23,6 @@
 #include "MEDCouplingCMesh.hxx"
 #include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingMemArray.txx"
-
 #include <sstream>
 #include <cmath>
 #include <algorithm>

diff --git a/src/RENUMBER_Swig/MEDRenumberCommon.i b/src/RENUMBER_Swig/MEDRenumberCommon.i
index 8a9b71ccc12dcfef42dddf4d478a86c16618dde5..a88e4fb6f9aa3b8a1d79bb2fe4a2da5f4a0bac88 100644 (file)
--- a/src/RENUMBER_Swig/MEDRenumberCommon.i
+++ b/src/RENUMBER_Swig/MEDRenumberCommon.i
@@ -22,6 +22,9 @@
 %include std_string.i
 
 %{
+#ifdef WIN32
+#define MEDCOUPLING_WIN32_SWIG
+#endif
 #include "MEDCouplingMemArray.txx"
 #include "MCAuto.hxx"
 #include "MEDCouplingDataArrayTypemaps.i"