also link in ODBC lib if wxUSE_ODBC (patch 1457800)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 797a519f48bee377e4be20358f83f9f0298e8cb8..91774b841aca02f8d83da4ee92b2855d63fc372d 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -61,6 +61,9 @@
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27ud_media")
             #endif
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27ud_media")
             #endif

+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27ud_odbc")
+            #endif

         #else // release
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpat")
         #else // release
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpat")


@@ -93,6 +96,9 @@
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27u_media")
             #endif
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27u_media")
             #endif

+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27u_odbc")
+            #endif

         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL
         #endif // debug/release
     #else // !_UNICODE
         #ifdef WXUSINGDLL


@@ -141,6 +147,9 @@
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27d_media")
             #endif
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27d_media")
             #endif

+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27d_odbc")
+            #endif

         #else // release
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpat")
         #else // release
             #if wxUSE_XML
                 #pragma comment(lib,"wxexpat")


@@ -173,6 +182,9 @@
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27_media")
             #endif
             #if wxUSE_MEDIACTRL
                 #pragma comment(lib,"wxmsw27_media")
             #endif

+            #if wxUSE_ODBC
+                #pragma comment(lib,"wxbase27_odbc")
+            #endif

         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else
         #endif // debug/release
     #endif // _UNICODE/!_UNICODE
 #else