From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Sep 2005 11:19:39 +0000 (+0000)
Subject: don't put odbc lib twice in the generated makefile (part of patch 1303833)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/61a15bac86cd10322606e63e288a177df643e03e

don't put odbc lib twice in the generated makefile (part of patch 1303833)


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

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index fa5fb02734..cb750a6391 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -187,7 +187,7 @@ FIXME: this template has (at least) the following bugs:
         <if cond="value in ['net','xml', 'odbc']">
             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
         </if>
-        <if cond="value not in ['base','net','xml']">
+        <if cond="value not in ['base','net', 'odbc', 'xml']">
             <sys-lib>wx$(WXPORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
         </if>
     </define-tag>