different name for release and debug build of third party libraries

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index deb3ed321cef2528af5211c49342d35fb1f21dd7..f882d35246339a99398ab4f71262657304947263 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -128,6 +128,10 @@
         <threading>multi</threading>        
     </template>
 
+    <template id="3rdparty_lib" template="anylib">
+        <libname>$(id)$(WXDEBUGFLAG)</libname>
+    </template>
+
 
     <!-- =============================================================== -->
     <!--                         3rd party libs:                         -->

diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index e166c5390627b169fed0947d0f656781240cf277..8f7521e0796f0db2931949326e500d05dd1501af 100644 (file)
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
     </set>
 
-    <lib id="wxjpeg" template="anylib"
+    <lib id="wxjpeg" template="3rdparty_lib"
          cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>

diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
index f76a8d2f1ea68635f7b4549e664b12b0c30f7986..ca2c0ca129b910cedd08fa834e2b4ad295a9668a 100644 (file)
--- a/build/bakefiles/odbc.bkl
+++ b/build/bakefiles/odbc.bkl
@@ -17,7 +17,7 @@
         <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
     </set>
 
-    <lib id="wxodbc" template="anylib"
+    <lib id="wxodbc" template="3rdparty_lib"
          cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>

diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 2f6b6d74de5ee29f8c85740bbf7ae571e973716c..6f83cf40504b0d2557686b669077e7183505c211 100644 (file)
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
     </set>
 
-    <lib id="wxpng" template="anylib"
+    <lib id="wxpng" template="3rdparty_lib"
          cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <include>$(INC_ZLIB)</include>

diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index 4a0753868891236f466e858dbf94e936c7d694e0..41b7301dd27790cdf94be36d410a8de3290ab750 100644 (file)
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
     </set>
 
-    <lib id="wxregex" template="anylib"
+    <lib id="wxregex" template="3rdparty_lib"
          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>

diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 453d8570bc277e3acb6111bf8f82290010f8fbc5..87d711ad01ae2485ec2a2effdb101c4ccf0f3bb1 100644 (file)
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -19,7 +19,7 @@
         <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
     </set>
     
-    <lib id="wxtiff" template="anylib"
+    <lib id="wxtiff" template="3rdparty_lib"
          cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>

diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index 18020fa730112ef4545387b64e634b07abc98b42..21c75be96cf2c65d74b24a5c39990ab74b25f9a1 100644 (file)
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
     </set>
 
-    <lib id="wxzlib" teplate="anylib"
+    <lib id="wxzlib" teplate="3rdparty_lib"
          cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>