From: Václav Slavík <vslavik@fastmail.fm>
Date: Fri, 28 Jan 2005 22:11:00 +0000 (+0000)
Subject: fixed linking against 3rd party libs in Unicode build
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6cab6476389e2e6ec257daa233d49e8245d8f642?ds=inline

fixed linking against 3rd party libs in Unicode build


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

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 0eae900a91..fbc2759cc2 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -115,8 +115,8 @@ FIXME: this template has (at least) the following bugs:
         <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
         <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
     </set>
-    <set var="WXSUBLIBPOSTFIX">
-        <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
+    <set var="WX3RDPARTLIBPOSTFIX">
+        <if cond="WX_DEBUG=='1'">d</if>
     </set>
 
     <set var="WXLIBPATH">
@@ -188,15 +188,15 @@ FIXME: this template has (at least) the following bugs:
         <__wx-libs-point/>
 
         <!-- wx 3rd party libs, always use them: -->
-        <sys-lib>wxtiff$(WXSUBLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxjpeg$(WXSUBLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxpng$(WXSUBLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxzlib$(WXSUBLIBPOSTFIX)</sys-lib> 
-        <!-- For regex we won't use the WXSUBLIBPOSTIX postfix: 
+        <sys-lib>wxtiff$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxjpeg$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxpng$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxzlib$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
+        <!-- For regex we won't use the WX3RDPARTLIBPOSTIX postfix: 
              unliked tiff, jpeg, png, zlib, expat, when building
              in Unicode mode, the "u" suffix is appended to regex -->
         <sys-lib>wxregex$(WXLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxexpat$(WXSUBLIBPOSTFIX)</sys-lib>
+        <sys-lib>wxexpat$(WX3RDPARTLIBPOSTFIX)</sys-lib>
    
         <!-- link-in system libs that wx depends on: -->
         <!-- If on borland, we don't need to do much            -->