diff --git a/Cantera/clib/src/clib_defs.h b/Cantera/clib/src/clib_defs.h index 642762c0b..4803cba04 100755 --- a/Cantera/clib/src/clib_defs.h +++ b/Cantera/clib/src/clib_defs.h @@ -3,8 +3,13 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#define DLL_IMPORT +#else #define DLL_IMPORT __declspec(dllimport) #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4267) #pragma warning(disable:4503) diff --git a/Cantera/clib/src/ctbdry.cpp b/Cantera/clib/src/ctbdry.cpp index 5b44ea0fb..dbc8d49c4 100755 --- a/Cantera/clib/src/ctbdry.cpp +++ b/Cantera/clib/src/ctbdry.cpp @@ -1,7 +1,11 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctfunc.cpp b/Cantera/clib/src/ctfunc.cpp index 3ae11a0f1..466c54157 100755 --- a/Cantera/clib/src/ctfunc.cpp +++ b/Cantera/clib/src/ctfunc.cpp @@ -8,7 +8,11 @@ using namespace Cantera; // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctmultiphase.cpp b/Cantera/clib/src/ctmultiphase.cpp index ffc35f80c..9ed5952de 100644 --- a/Cantera/clib/src/ctmultiphase.cpp +++ b/Cantera/clib/src/ctmultiphase.cpp @@ -10,7 +10,11 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctnum.cpp b/Cantera/clib/src/ctnum.cpp index 1dbc7f301..b3ad3650d 100755 --- a/Cantera/clib/src/ctnum.cpp +++ b/Cantera/clib/src/ctnum.cpp @@ -12,7 +12,11 @@ inline BandMatrix* _bmatrix(int i) { // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctonedim.cpp b/Cantera/clib/src/ctonedim.cpp index 37d53de9d..461288b9d 100644 --- a/Cantera/clib/src/ctonedim.cpp +++ b/Cantera/clib/src/ctonedim.cpp @@ -19,7 +19,11 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctreactor.cpp b/Cantera/clib/src/ctreactor.cpp index f7c23910e..1cc7ec2e3 100755 --- a/Cantera/clib/src/ctreactor.cpp +++ b/Cantera/clib/src/ctreactor.cpp @@ -13,7 +13,11 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctrpath.cpp b/Cantera/clib/src/ctrpath.cpp index 71bd5b8b5..7fe0449c7 100755 --- a/Cantera/clib/src/ctrpath.cpp +++ b/Cantera/clib/src/ctrpath.cpp @@ -1,7 +1,11 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctstagn.cpp b/Cantera/clib/src/ctstagn.cpp index c2e5d9734..f7bd67846 100755 --- a/Cantera/clib/src/ctstagn.cpp +++ b/Cantera/clib/src/ctstagn.cpp @@ -10,7 +10,11 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctsurf.cpp b/Cantera/clib/src/ctsurf.cpp index 88ee78188..588fb2147 100755 --- a/Cantera/clib/src/ctsurf.cpp +++ b/Cantera/clib/src/ctsurf.cpp @@ -14,7 +14,11 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else diff --git a/Cantera/clib/src/ctxml.cpp b/Cantera/clib/src/ctxml.cpp index 89e1b7d6d..fa2d0f997 100644 --- a/Cantera/clib/src/ctxml.cpp +++ b/Cantera/clib/src/ctxml.cpp @@ -1,6 +1,10 @@ // Build as a DLL under Windows #ifdef WIN32 +#ifdef NO_DLL_BUILD +#define DLL_EXPORT +#else #define DLL_EXPORT __declspec(dllexport) +#endif #pragma warning(disable:4786) #pragma warning(disable:4503) #else