X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd928524917cb25b0bf016c6f24dfb85de527a3e..6c1483e3ec1250e1245bf658f850adb1cb240845:/include/wx/dlimpexp.h

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 92eabb7b6d..f3ac1f085b 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 <vadim@wxwindows.org>
+ * Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
 
@@ -48,6 +48,9 @@
 #        define WXEXPORT __declspec(export)
 #        define WXIMPORT __declspec(import)
 #    endif
+#elif defined(__CYGWIN__)
+#    define WXEXPORT __declspec(dllexport)
+#    define WXIMPORT __declspec(dllimport)
 #endif
 
 /* for other platforms/compilers we don't anything */
@@ -57,7 +60,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).
 
@@ -74,10 +77,16 @@
 #    define WXMAKINGDLL_NET
 #    define WXMAKINGDLL_CORE
 #    define WXMAKINGDLL_ADV
+#    define WXMAKINGDLL_QA
 #    define WXMAKINGDLL_ODBC
 #    define WXMAKINGDLL_DBGRID
 #    define WXMAKINGDLL_HTML
+#    define WXMAKINGDLL_GL
 #    define WXMAKINGDLL_XML
+#    define WXMAKINGDLL_XRC
+#    define WXMAKINGDLL_AUI
+#    define WXMAKINGDLL_RICHTEXT
+#    define WXMAKINGDLL_MEDIA
 #endif /* WXMAKINGDLL */
 
 /*
@@ -139,6 +148,17 @@
 #    define WXDLLIMPEXP_DATA_ODBC(type) type
 #endif
 
+#ifdef WXMAKINGDLL_QA
+#    define WXDLLIMPEXP_QA WXEXPORT
+#    define WXDLLIMPEXP_DATA_QA(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_QA WXIMPORT
+#    define WXDLLIMPEXP_DATA_QA(type) WXIMPORT type
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_QA
+#    define WXDLLIMPEXP_DATA_QA(type) type
+#endif
+
 #ifdef WXMAKINGDLL_DBGRID
 #    define WXDLLIMPEXP_DBGRID WXEXPORT
 #    define WXDLLIMPEXP_DATA_DBGRID(type) WXEXPORT type
@@ -177,6 +197,38 @@
 #    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
+
+#ifdef WXMAKINGDLL_AUI
+#    define WXDLLIMPEXP_AUI WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_AUI WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_AUI
+#endif
+
+#ifdef WXMAKINGDLL_RICHTEXT
+#    define WXDLLIMPEXP_RICHTEXT WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_RICHTEXT WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_RICHTEXT
+#endif
+
+#ifdef WXMAKINGDLL_MEDIA
+#    define WXDLLIMPEXP_MEDIA WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_MEDIA WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_MEDIA
+#endif
+
 /* for backwards compatibility, define suffix-less versions too */
 #define WXDLLEXPORT WXDLLIMPEXP_CORE
 #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE