Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow predefining wxNO_XXX_LIB symbols to avoid implicitly linking with the corresponding library when using msvc/wx/setup.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-13 02:09:52 +00:00
parent e0257cc505
commit 3fb26cf229
2 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/msvc/wx/setup.h
View File

@@ -72,53 +72,61 @@
#define wx3RD_PARTY_LIB_NAME_U(name) "wx" name wxSUFFIX_STR
#pragma comment(lib, wxWX_LIB_NAME("base", ""))
#pragma comment(lib, wxBASE_LIB_NAME("net"))
#pragma comment(lib, wxBASE_LIB_NAME("xml"))
#if wxUSE_REGEX
#ifndef wxNO_NET_LIB
#pragma comment(lib, wxBASE_LIB_NAME("net"))
#endif
#ifndef wxNO_XML_LIB
#pragma comment(lib, wxBASE_LIB_NAME("xml"))
#endif
#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
#endif
#if wxUSE_GUI
#if wxUSE_XML
#if wxUSE_XML && !defined(wxNO_EXPAT_LIB)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
#endif
#if wxUSE_LIBJPEG
#if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
#endif
#if wxUSE_LIBPNG
#if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
#endif
#if wxUSE_LIBTIFF
#if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
#endif
#if wxUSE_ZLIB
#if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB)
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
#endif
#pragma comment(lib, wxMSW_LIB_NAME("adv"))
#pragma comment(lib, wxMSW_LIB_NAME("core"))
#pragma comment(lib, wxMSW_LIB_NAME("html"))
#if wxUSE_GLCANVAS
#ifndef wxNO_ADV_LIB
#pragma comment(lib, wxMSW_LIB_NAME("adv"))
#endif
#ifndef wxNO_HTML_LIB
#pragma comment(lib, wxMSW_LIB_NAME("html"))
#endif
#if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)
#pragma comment(lib, wxMSW_LIB_NAME("gl"))
#endif
#if wxUSE_DEBUGREPORT
#if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
#pragma comment(lib, wxMSW_LIB_NAME("qa"))
#endif
#if wxUSE_XRC
#if wxUSE_XRC && !defined(wxNO_XRC_LIB)
#pragma comment(lib, wxMSW_LIB_NAME("xrc"))
#endif
#if wxUSE_AUI
#if wxUSE_AUI && !defined(wxNO_AUI_LIB)
#pragma comment(lib, wxMSW_LIB_NAME("aui"))
#endif
#if wxUSE_RICHTEXT
#if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)
#pragma comment(lib, wxMSW_LIB_NAME("richtext"))
#endif
#if wxUSE_MEDIACTRL
#if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)
#pragma comment(lib, wxMSW_LIB_NAME("media"))
#endif
#if wxUSE_ODBC
#pragma comment(lib, wxMSW_LIB_NAME("odbc"))
#endif
#endif // wxUSE_GUI
#else
#error "This file should only be included when using Microsoft Visual C++"