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

avoid referencing xml and html libs when they are not enabled

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-04-30 17:08:50 +00:00
parent d056df8281
commit 65a7d01fe8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@
#endif #endif
#pragma comment(lib, wxBASE_LIB_NAME("net")) #pragma comment(lib, wxBASE_LIB_NAME("net"))
#endif #endif
#ifndef wxNO_XML_LIB #if wxUSE_XML && !defined(wxNO_XML_LIB)
#pragma comment(lib, wxBASE_LIB_NAME("xml")) #pragma comment(lib, wxBASE_LIB_NAME("xml"))
#endif #endif
#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL) #if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL)
@@ -183,7 +183,7 @@
#pragma comment(lib, wxTOOLKIT_LIB_NAME("adv")) #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv"))
#endif #endif
#ifndef wxNO_HTML_LIB #if wxUSE_HTML && !defined(wxNO_HTML_LIB)
#pragma comment(lib, wxTOOLKIT_LIB_NAME("html")) #pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
#endif #endif
#if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB) #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)