fixes for moving wxHTML files into their own DLL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -381,6 +381,7 @@ typedef int wxWindowID;
|
||||
#ifdef WXUSINGDLL
|
||||
#define WXUSINGDLL_BASE
|
||||
#define WXUSINGDLL_CORE
|
||||
#define WXUSINGDLL_HTML
|
||||
#endif // WXUSINGDLL
|
||||
|
||||
|
||||
@@ -408,6 +409,17 @@ typedef int wxWindowID;
|
||||
#define WXDLLIMPEXP_DATA_CORE(type) type
|
||||
#endif
|
||||
|
||||
#ifdef WXMAKINGDLL_HTML
|
||||
#define WXDLLIMPEXP_HTML WXEXPORT
|
||||
#define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
|
||||
#elif defined(WXUSINGDLL_HTML)
|
||||
#define WXDLLIMPEXP_HTML WXIMPORT
|
||||
#define WXDLLIMPEXP_DATA_HTML(type) WXIMPORT type
|
||||
#else // not making nor using DLL
|
||||
#define WXDLLIMPEXP_HTML
|
||||
#define WXDLLIMPEXP_DATA_HTML(type) type
|
||||
#endif
|
||||
|
||||
// for backwards compatibility, define suffix-less versions too
|
||||
#define WXDLLEXPORT WXDLLIMPEXP_CORE
|
||||
#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE
|
||||
|
Reference in New Issue
Block a user