X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cc66b6c0b7b50bfba244e4f8e48a9b071e75ae2..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/dlimpexp.h

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index cc892158e1..6bdfbf458b 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
  */
 
@@ -36,6 +36,9 @@
            want that!
          */
 #        define WXIMPORT
+#    elif defined(__EMX__)
+#        define WXEXPORT
+#        define WXIMPORT
 #    elif (!(defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )))
 #        define WXEXPORT _Export
 #        define WXIMPORT _Export
@@ -54,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).
 
@@ -74,7 +77,10 @@
 #    define WXMAKINGDLL_ODBC
 #    define WXMAKINGDLL_DBGRID
 #    define WXMAKINGDLL_HTML
+#    define WXMAKINGDLL_GL
 #    define WXMAKINGDLL_XML
+#    define WXMAKINGDLL_XRC
+#    define WXMAKINGDLL_MEDIA
 #endif /* WXMAKINGDLL */
 
 /*
@@ -136,6 +142,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
@@ -174,6 +191,22 @@
 #    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_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