fixed linking against 3rd party libs

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

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index 8f7521e0796f0db2931949326e500d05dd1501af..8f142e1a9a571e173384d9493521b968e35e5f64 100644 (file)
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">
         <set var="wxUSE_LIBJPEG">builtin</set>
     </if>
     <set var="LIB_JPEG">

-        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg</if>
+        <if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>

     </set>
     <set var="INC_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
     </set>
     <set var="INC_JPEG">
         <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>

diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
index ca2c0ca129b910cedd08fa834e2b4ad295a9668a..fd325a5fa2bd1ff5ef3085c6607b996652fdd715 100644 (file)
--- a/build/bakefiles/odbc.bkl
+++ b/build/bakefiles/odbc.bkl
@@ -11,7 +11,7 @@
         </set>
     </if>
     <set var="LIB_ODBC">
         </set>
     </if>
     <set var="LIB_ODBC">

-        <if cond="wxUSE_ODBC=='builtin'">wxodbc</if>
+        <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)</if>

     </set>
     <set var="INC_ODBC">
         <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
     </set>
     <set var="INC_ODBC">
         <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 6f83cf40504b0d2557686b669077e7183505c211..f2a88541be693e50b4c5857ba7dc27b4061ef38f 100644 (file)
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_LIBPNG">builtin</set>
     </if>
     <set var="LIB_PNG">
         <set var="wxUSE_LIBPNG">builtin</set>
     </if>
     <set var="LIB_PNG">

-        <if cond="wxUSE_LIBPNG=='builtin'">wxpng</if>
+        <if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)</if>

     </set>
     <set var="INC_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
     </set>
     <set var="INC_PNG">
         <if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index 41b7301dd27790cdf94be36d410a8de3290ab750..f0fc48c539268c910daf1dab19d5d285d7ccf965 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_REGEX">builtin</set>
     </if>
     <set var="LIB_REGEX">
         <set var="wxUSE_REGEX">builtin</set>
     </if>
     <set var="LIB_REGEX">

-        <if cond="wxUSE_REGEX=='builtin'">wxregex</if>
+        <if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)</if>

     </set>
     <set var="INC_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
     </set>
     <set var="INC_REGEX">
         <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 87d711ad01ae2485ec2a2effdb101c4ccf0f3bb1..60558a57439a1b67eef9c79a2c7ffbe7ccea44bb 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_LIBTIFF">builtin</set>
     </if>
     <set var="LIB_TIFF">
         <set var="wxUSE_LIBTIFF">builtin</set>
     </if>
     <set var="LIB_TIFF">

-        <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff</if>
+        <if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)</if>

     </set>
     <set var="INC_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>
     </set>
     <set var="INC_TIFF">
         <if cond="wxUSE_LIBTIFF=='builtin'">$(SRCDIR)/src/tiff</if>

diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index 21c75be96cf2c65d74b24a5c39990ab74b25f9a1..12e0f9db753e50cbe77b9d7cf4a21b899c1c6f9a 100644 (file)
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -8,7 +8,7 @@
         <set var="wxUSE_ZLIB">builtin</set>
     </if>
     <set var="LIB_ZLIB">
         <set var="wxUSE_ZLIB">builtin</set>
     </if>
     <set var="LIB_ZLIB">

-        <if cond="wxUSE_ZLIB=='builtin'">wxzlib</if>
+        <if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)</if>

     </set>
     <set var="INC_ZLIB">
         <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
     </set>
     <set var="INC_ZLIB">
         <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>