From fc36d9e993d543f53ac06e417dcd3449f2aba811 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 4 Sep 2018 10:54:21 +0300 Subject: [PATCH] New iteration with Anthony. --- src/MEDCoupling/MEDCoupling.hxx | 2 +- src/MEDCoupling/Test/MEDCouplingBasicsTest1.cxx | 2 -- src/RENUMBER_Swig/MEDRenumberCommon.i | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MEDCoupling/MEDCoupling.hxx b/src/MEDCoupling/MEDCoupling.hxx index 5b6208fb3..391b9d378 100644 --- 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 7b572ab07..d3ac9fa3d 100644 --- 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 #include #include diff --git a/src/RENUMBER_Swig/MEDRenumberCommon.i b/src/RENUMBER_Swig/MEDRenumberCommon.i index 8a9b71ccc..a88e4fb6f 100644 --- 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" -- 2.39.2