don't required all WXMAKINGDLL_FOO defines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
81659205e3
commit
3d41c70801
@ -387,6 +387,7 @@ typedef int wxWindowID;
|
|||||||
// WXDLLEXPORT maps to export declaration when building the DLL, to import
|
// WXDLLEXPORT maps to export declaration when building the DLL, to import
|
||||||
// declaration if using it or to nothing at all if we don't use wxWin as DLL
|
// declaration if using it or to nothing at all if we don't use wxWin as DLL
|
||||||
#ifdef WXMAKINGDLL_BASE
|
#ifdef WXMAKINGDLL_BASE
|
||||||
|
#undef WXUSINGDLL_BASE
|
||||||
#define WXDLLIMPEXP_BASE WXEXPORT
|
#define WXDLLIMPEXP_BASE WXEXPORT
|
||||||
#define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
|
#define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
|
||||||
#elif defined(WXUSINGDLL_BASE)
|
#elif defined(WXUSINGDLL_BASE)
|
||||||
@ -398,6 +399,7 @@ typedef int wxWindowID;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WXMAKINGDLL_CORE
|
#ifdef WXMAKINGDLL_CORE
|
||||||
|
#undef WXUSINGDLL_CORE
|
||||||
#define WXDLLIMPEXP_CORE WXEXPORT
|
#define WXDLLIMPEXP_CORE WXEXPORT
|
||||||
#define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
|
#define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
|
||||||
#elif defined(WXUSINGDLL_CORE)
|
#elif defined(WXUSINGDLL_CORE)
|
||||||
|
Loading…
Reference in New Issue
Block a user