fixed linking against builtin 3rd party libs

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

diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index 434d4b9a2b1abce9335e23238477c1dbab9d24bc..62143724b65469c9fa7186f89b25e92a54d54e91 100644 (file)
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -17,13 +17,6 @@
         <define>wxUSE_BASE=1</define> 
         <define>WXMAKINGDLL</define>
         <sources>$(MONOLIB_SRC)</sources>
-
-        <library>$(LIB_ZLIB)</library>
-        <library>$(LIB_REGEX)</library>
-        <library>$(LIB_PNG)</library>
-        <library>$(LIB_JPEG)</library>
-        <library>$(LIB_TIFF)</library>
-        <library>$(LIB_ODBC)</library>
     </dll>
     
     <lib id="monolib" template="wx_lib"

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index bb6dd8c2e4ecdee99f90722b2f9b8194950bbe55..78561c9ddaecfa66d34c07ae07a3098c749cd999 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -12,12 +12,6 @@
         <define>wxUSE_BASE=1</define>
         <define>wxUSE_GUI=0</define> 
         <sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
-        
-        <library>$(LIB_ZLIB)</library>
-        <library>$(LIB_REGEX)</library>
-        <library>$(LIB_PNG)</library>
-        <library>$(LIB_JPEG)</library>
-        <library>$(LIB_TIFF)</library>
     </dll>
     
     <lib id="baselib" template="wx_lib"
@@ -38,8 +32,6 @@
         <sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
         
         <wx-lib>base</wx-lib>
-      
-        <library>$(LIB_ODBC)</library>        
     </dll>
     
     <lib id="corelib" template="wx_lib"