From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 22 Jan 2004 08:56:24 +0000 (+0000)
Subject: bcc has ODBC symbols in odbc32.lib, not import32.lib
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bfca95348bb011b507db463c62107bc8f68614ff

bcc has ODBC symbols in odbc32.lib, not import32.lib


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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 4315de2ceb..3e633ad293 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -315,7 +315,6 @@
                 <sys-lib>winmm</sys-lib>
                 <sys-lib>shell32</sys-lib>
                 <sys-lib>comctl32</sys-lib>
-                <sys-lib>odbc32</sys-lib>
                 <sys-lib>ole32</sys-lib>
                 <sys-lib>oleaut32</sys-lib>
                 <sys-lib>uuid</sys-lib>
@@ -326,6 +325,7 @@
             <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
+            <sys-lib>odbc32</sys-lib>
         </if>
     </template>