X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd928524917cb25b0bf016c6f24dfb85de527a3e..1e151594721201f2048aa295dcf35acd28f012b9:/include/wx/dlimpexp.h?ds=sidebyside diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index 92eabb7b6d..fd823a5144 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -5,7 +5,7 @@ * Modified by: * Created: 16.10.2003 (extracted from wx/defs.h) * RCS-ID: $Id$ - * Copyright: (c) 2003 Vadim Zeitlin + * Copyright: (c) 2003 Vadim Zeitlin * Licence: wxWindows licence */ @@ -57,7 +57,7 @@ #endif /* - We support building wxWindows as a set of several libraries but we don't + We support building wxWidgets as a set of several libraries but we don't support arbitrary combinations of libs/DLLs: either we build all of them as DLLs (in which case WXMAKINGDLL is defined) or none (it isn't). @@ -78,6 +78,7 @@ # define WXMAKINGDLL_DBGRID # define WXMAKINGDLL_HTML # define WXMAKINGDLL_XML +# define WXMAKINGDLL_XRC #endif /* WXMAKINGDLL */ /* @@ -177,6 +178,14 @@ # define WXDLLIMPEXP_XML #endif +#ifdef WXMAKINGDLL_XRC +# define WXDLLIMPEXP_XRC WXEXPORT +#elif defined(WXUSINGDLL) +# define WXDLLIMPEXP_XRC WXIMPORT +#else /* not making nor using DLL */ +# define WXDLLIMPEXP_XRC +#endif + /* for backwards compatibility, define suffix-less versions too */ #define WXDLLEXPORT WXDLLIMPEXP_CORE #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE