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

don't link with GUI libraries when wxUSE_GUI==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-27 15:03:59 +00:00
parent db419f1f32
commit 8aa2736f3c
1 changed files with 176 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,14 @@
#endif #endif
#ifdef _DEBUG #ifdef _DEBUG
#pragma comment(lib,"wxbase28ud")
#pragma comment(lib,"wxbase28ud_net")
#pragma comment(lib,"wxbase28ud_xml")
#if wxUSE_REGEX
#pragma comment(lib,"wxregexud")
#endif
#if wxUSE_GUI
#if wxUSE_XML #if wxUSE_XML
#pragma comment(lib,"wxexpatd") #pragma comment(lib,"wxexpatd")
#endif #endif
@@ -39,18 +47,12 @@
#if wxUSE_LIBPNG #if wxUSE_LIBPNG
#pragma comment(lib,"wxpngd") #pragma comment(lib,"wxpngd")
#endif #endif
#if wxUSE_REGEX
#pragma comment(lib,"wxregexud")
#endif
#if wxUSE_LIBTIFF #if wxUSE_LIBTIFF
#pragma comment(lib,"wxtiffd") #pragma comment(lib,"wxtiffd")
#endif #endif
#if wxUSE_ZLIB #if wxUSE_ZLIB
#pragma comment(lib,"wxzlibd") #pragma comment(lib,"wxzlibd")
#endif #endif
#pragma comment(lib,"wxbase28ud")
#pragma comment(lib,"wxbase28ud_net")
#pragma comment(lib,"wxbase28ud_xml")
#pragma comment(lib,"wxmsw28ud_adv") #pragma comment(lib,"wxmsw28ud_adv")
#pragma comment(lib,"wxmsw28ud_core") #pragma comment(lib,"wxmsw28ud_core")
#pragma comment(lib,"wxmsw28ud_html") #pragma comment(lib,"wxmsw28ud_html")
@@ -75,7 +77,16 @@
#if wxUSE_ODBC #if wxUSE_ODBC
#pragma comment(lib,"wxbase28ud_odbc") #pragma comment(lib,"wxbase28ud_odbc")
#endif #endif
#endif // wxUSE_GUI
#else // release #else // release
#pragma comment(lib,"wxbase28u")
#pragma comment(lib,"wxbase28u_net")
#pragma comment(lib,"wxbase28u_xml")
#if wxUSE_REGEX
#pragma comment(lib,"wxregexu")
#endif
#if wxUSE_GUI
#if wxUSE_XML #if wxUSE_XML
#pragma comment(lib,"wxexpat") #pragma comment(lib,"wxexpat")
#endif #endif
@@ -85,18 +96,12 @@
#if wxUSE_LIBPNG #if wxUSE_LIBPNG
#pragma comment(lib,"wxpng") #pragma comment(lib,"wxpng")
#endif #endif
#if wxUSE_REGEX
#pragma comment(lib,"wxregexu")
#endif
#if wxUSE_LIBTIFF #if wxUSE_LIBTIFF
#pragma comment(lib,"wxtiff") #pragma comment(lib,"wxtiff")
#endif #endif
#if wxUSE_ZLIB #if wxUSE_ZLIB
#pragma comment(lib,"wxzlib") #pragma comment(lib,"wxzlib")
#endif #endif
#pragma comment(lib,"wxbase28u")
#pragma comment(lib,"wxbase28u_net")
#pragma comment(lib,"wxbase28u_xml")
#pragma comment(lib,"wxmsw28u_adv") #pragma comment(lib,"wxmsw28u_adv")
#pragma comment(lib,"wxmsw28u_core") #pragma comment(lib,"wxmsw28u_core")
#pragma comment(lib,"wxmsw28u_html") #pragma comment(lib,"wxmsw28u_html")
@@ -121,6 +126,7 @@
#if wxUSE_ODBC #if wxUSE_ODBC
#pragma comment(lib,"wxbase28u_odbc") #pragma comment(lib,"wxbase28u_odbc")
#endif #endif
#endif // wxUSE_GUI
#endif // debug/release #endif // debug/release
#else // !_UNICODE #else // !_UNICODE
#ifdef WXUSINGDLL #ifdef WXUSINGDLL
@@ -138,6 +144,14 @@
#endif // shared/static #endif // shared/static
#ifdef _DEBUG #ifdef _DEBUG
#pragma comment(lib,"wxbase28d")
#pragma comment(lib,"wxbase28d_net")
#pragma comment(lib,"wxbase28d_xml")
#if wxUSE_REGEX
#pragma comment(lib,"wxregexd")
#endif
#if wxUSE_GUI
#if wxUSE_XML #if wxUSE_XML
#pragma comment(lib,"wxexpatd") #pragma comment(lib,"wxexpatd")
#endif #endif
@@ -147,18 +161,12 @@
#if wxUSE_LIBPNG #if wxUSE_LIBPNG
#pragma comment(lib,"wxpngd") #pragma comment(lib,"wxpngd")
#endif #endif
#if wxUSE_REGEX
#pragma comment(lib,"wxregexd")
#endif
#if wxUSE_LIBTIFF #if wxUSE_LIBTIFF
#pragma comment(lib,"wxtiffd") #pragma comment(lib,"wxtiffd")
#endif #endif
#if wxUSE_ZLIB #if wxUSE_ZLIB
#pragma comment(lib,"wxzlibd") #pragma comment(lib,"wxzlibd")
#endif #endif
#pragma comment(lib,"wxbase28d")
#pragma comment(lib,"wxbase28d_net")
#pragma comment(lib,"wxbase28d_xml")
#pragma comment(lib,"wxmsw28d_adv") #pragma comment(lib,"wxmsw28d_adv")
#pragma comment(lib,"wxmsw28d_core") #pragma comment(lib,"wxmsw28d_core")
#pragma comment(lib,"wxmsw28d_html") #pragma comment(lib,"wxmsw28d_html")
@@ -183,7 +191,16 @@
#if wxUSE_ODBC #if wxUSE_ODBC
#pragma comment(lib,"wxbase28d_odbc") #pragma comment(lib,"wxbase28d_odbc")
#endif #endif
#endif // wxUSE_GUI
#else // release #else // release
#pragma comment(lib,"wxbase28")
#pragma comment(lib,"wxbase28_net")
#pragma comment(lib,"wxbase28_xml")
#if wxUSE_REGEX
#pragma comment(lib,"wxregex")
#endif
#if wxUSE_GUI
#if wxUSE_XML #if wxUSE_XML
#pragma comment(lib,"wxexpat") #pragma comment(lib,"wxexpat")
#endif #endif
@@ -193,18 +210,12 @@
#if wxUSE_LIBPNG #if wxUSE_LIBPNG
#pragma comment(lib,"wxpng") #pragma comment(lib,"wxpng")
#endif #endif
#if wxUSE_REGEX
#pragma comment(lib,"wxregex")
#endif
#if wxUSE_LIBTIFF #if wxUSE_LIBTIFF
#pragma comment(lib,"wxtiff") #pragma comment(lib,"wxtiff")
#endif #endif
#if wxUSE_ZLIB #if wxUSE_ZLIB
#pragma comment(lib,"wxzlib") #pragma comment(lib,"wxzlib")
#endif #endif
#pragma comment(lib,"wxbase28")
#pragma comment(lib,"wxbase28_net")
#pragma comment(lib,"wxbase28_xml")
#pragma comment(lib,"wxmsw28_adv") #pragma comment(lib,"wxmsw28_adv")
#pragma comment(lib,"wxmsw28_core") #pragma comment(lib,"wxmsw28_core")
#pragma comment(lib,"wxmsw28_html") #pragma comment(lib,"wxmsw28_html")
@@ -229,6 +240,7 @@
#if wxUSE_ODBC #if wxUSE_ODBC
#pragma comment(lib,"wxbase28_odbc") #pragma comment(lib,"wxbase28_odbc")
#endif #endif
#endif // wxUSE_GUI
#endif // debug/release #endif // debug/release
#endif // _UNICODE/!_UNICODE #endif // _UNICODE/!_UNICODE
#else #else