-/*
- Finally, although this is not really a configuration check, do it here for
- now as we'll supplement it with a real consistency check verifying that
- wxUSE_UNICODE_MSLU corresponds to USE_MSLU in the makefiles. But for MSVC
- we can do even better: not just check for consistency but even link in the
- lib ourselves if needed.
-
- Notice that this is used for DLL wx build, as otherwise we have to do the
- same for the main executable and not the (static) library. It is done in
- msvc/wx/setup.h in that case.
- */
-#if wxUSE_UNICODE_MSLU && \
- (defined(WXMAKINGDLL) || \
- defined(WXMAKINGDLL_NET) || \
- defined(WXMAKINGDLL_CORE) || \
- defined(WXMAKINGDLL_ADV) || \
- defined(WXMAKINGDLL_ODBC) || \
- defined(WXMAKINGDLL_DBGRID) || \
- defined(WXMAKINGDLL_HTML) || \
- defined(WXMAKINGDLL_GL) || \
- defined(WXMAKINGDLL_XML) || \
- defined(WXMAKINGDLL_XRC) || \
- defined(WXMAKINGDLL_MEDIA))
- // first remove all default libraries
- #pragma comment(linker, "/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib")
-
- // then add unicows.lib as the first library
- #pragma comment(lib, "unicows.lib")
-
- // and only then re-add back all the other ones
- #pragma comment(lib, "kernel32.lib")
- #pragma comment(lib, "user32.lib")
- #pragma comment(lib, "gdi32.lib")
- #pragma comment(lib, "winspool.lib")
- #pragma comment(lib, "comdlg32.lib")
- #pragma comment(lib, "advapi32.lib")
- #pragma comment(lib, "shell32.lib")
- #pragma comment(lib, "oleacc.lib")
+#if !wxUSE_OLE
+# if wxUSE_ACTIVEX
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxActiveXContainer requires wxUSE_OLE"
+# else
+# undef wxUSE_ACTIVEX
+# define wxUSE_ACTIVEX 0
+# endif
+# endif
+
+# if wxUSE_DATAOBJ
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DATAOBJ requires wxUSE_OLE"
+# else
+# undef wxUSE_DATAOBJ
+# define wxUSE_DATAOBJ 0
+# endif
+# endif
+
+# if wxUSE_OLE_AUTOMATION
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxAutomationObject requires wxUSE_OLE"
+# else
+# undef wxUSE_OLE_AUTOMATION
+# define wxUSE_OLE_AUTOMATION 0
+# endif
+# endif
+#endif /* !wxUSE_OLE */
+
+#if !wxUSE_ACTIVEX
+# if wxUSE_MEDIACTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxMediaCtl requires wxActiveXContainer"
+# else
+# undef wxUSE_MEDIACTRL
+# define wxUSE_MEDIACTRL 0
+# endif
+# endif
+#endif /* !wxUSE_ACTIVEX */
+
+#if !wxUSE_THREADS
+# if wxUSE_FSWATCHER
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxFileSystemWatcher requires wxThread under MSW"
+# else
+# undef wxUSE_FSWATCHER
+# define wxUSE_FSWATCHER 0
+# endif
+# endif
+#endif /* !wxUSE_THREADS */
+
+#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
+# undef wxUSE_POSTSCRIPT
+# define wxUSE_POSTSCRIPT 1