From 8b93b050cf68cf0f75dd5055cb650491e0120a6d Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 30 Apr 2014 17:08:50 +0000 Subject: [PATCH] avoid referencing xml and html libs when they are not enabled git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/msvc/wx/setup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h index ad0696e245..57a18b10d6 100644 --- a/include/msvc/wx/setup.h +++ b/include/msvc/wx/setup.h @@ -153,7 +153,7 @@ #endif #pragma comment(lib, wxBASE_LIB_NAME("net")) #endif -#ifndef wxNO_XML_LIB +#if wxUSE_XML && !defined(wxNO_XML_LIB) #pragma comment(lib, wxBASE_LIB_NAME("xml")) #endif #if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL) @@ -183,7 +183,7 @@ #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv")) #endif - #ifndef wxNO_HTML_LIB + #if wxUSE_HTML && !defined(wxNO_HTML_LIB) #pragma comment(lib, wxTOOLKIT_LIB_NAME("html")) #endif #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)