adapt default config to declare dllexport only if DLL_EXPORT is defined

Author: svigerske

src/CbcSolverConfig.h

@@ -55,7 +55,7 @@
 #endif
 
 #ifndef CBCSOLVERLIB_EXPORT
-# ifdef _WIN32
+# if defined(_WIN32) && defined(DLL_EXPORT)
 #  ifdef CBCSOLVER_BUILD
 #   define CBCSOLVERLIB_EXPORT __declspec(dllexport)
 #  else
@@ -69,7 +69,7 @@
 
 #endif /* HAVE_CONFIG_H */
 
-#endif /*__CBCCONFIG_H__*/
+#endif /*__CBCSOLVERCONFIG_H__*/
 
 /* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
 */

src/OsiCbc/OsiCbcConfig.h

@@ -49,7 +49,7 @@
 #else /* HAVE_CONFIG_H */
 
 #ifndef OSICBCLIB_EXPORT
-# ifdef _WIN32
+# if defined(_WIN32) && defined(DLL_EXPORT)
 #  ifdef OSILIB_BUILD
 #   define OSICBCLIB_EXPORT __declspec(dllexport)
 #  else

src/config_cbc_default.h

@@ -17,8 +17,7 @@
 #define CBC_VERSION_RELEASE 9999
 
 #ifndef CBCLIB_EXPORT
-#ifdef _WIN32
-/* assuming we link against a CoinUtils DLL */
+#if defined(_WIN32) && defined(DLL_EXPORT)
 #define CBCLIB_EXPORT __declspec(dllimport)
 #else
 #define CBCLIB_EXPORT

src/config_default.h

@@ -2,10 +2,9 @@
 /* include the COIN-OR-wide system specific configure header */
 #include "configall_system.h"
 
-/* this needs to come before the include of config_coinutils_default.h */
+/* this needs to come before the include of config_cbc_default.h */
 #ifndef CBCLIB_EXPORT
-#ifdef _WIN32
-/* assuming we build a CoinUtils DLL */
+#if defined(_WIN32) && defined(DLL_EXPORT)
 #define CBCLIB_EXPORT __declspec(dllexport)
 #else
 #define CBCLIB_EXPORT