standardized WXMAKINGDLL approach

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-08 20:47:17 +00:00
parent 7da09e52ec
commit 510b9edbb6
18 changed files with 57 additions and 65 deletions

View File

@@ -18,32 +18,24 @@
* If we're using wx in Dynamic Library format do we
* want FL to be in DLL form as well?
*/
#if defined(WXUSINGDLL) && \
(defined(WXMAKING_FL_DLL) || defined(WXUSING_FL_DLL))
#if defined(WXMAKING_FL_DLL)
// When building the DLL WXFLDECLSPEC exports classes
# define WXFL_DECLSPEC WXEXPORT
#elif defined(WXUSING_FL_DLL)
// When building the DLL WXFLDECLSPEC imports classes
# define WXFL_DECLSPEC WXIMPORT
#endif // defined(WXBUILD_FL_DLL)
#else
// When building the static library nullify the effect of WXFL_DECLSPEC
#define WXFL_DECLSPEC
#endif // WXUSINGDLL && (WXMAKING_FL_DLL || WXUSING_FL_DLL)
#ifdef WXMAKINGDLL_FL
#define WXDLLIMPEXP_FL WXEXPORT
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_FL WXIMPORT
#else // not making nor using DLL
#define WXDLLIMPEXP_FL
#endif
///////////////////////////////////////////////////////////////////////////////
// Override some of the wxArray functions to
// include our definitions
///////////////////////////////////////////////////////////////////////////////
#define WXFL_DEFINE_ARRAY(c,l) \
class WXFL_DECLSPEC l; \
class WXDLLIMPEXP_FL l; \
WX_DEFINE_ARRAY(c,l)
#define WXFL_DEFINE_ARRAY_LONG(t,l) \
class WXFL_DECLSPEC l; \
class WXDLLIMPEXP_FL l; \
WX_DEFINE_ARRAY_LONG(t,l)