From ee196d6480cfa6711387f09a73dbf55f6a805706 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Thu, 16 Jun 2005 18:40:20 +0000
Subject: [PATCH] some 3rd party libs are not buildable under eVC, don't link
 against them

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/wxpresets/presets/wx_win32.bkl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 992eab2e93..fa5fb02734 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -223,14 +223,14 @@ FIXME: this template has (at least) the following bugs:
          after __wx-libs-point: -->
     <define-tag name="__wx-syslibs" rules="exe,dll,module">
         <!-- wx 3rd party libs, always use them: -->
-        <sys-lib>wxtiff$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
-        <sys-lib>wxjpeg$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
-        <sys-lib>wxpng$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
-        <sys-lib>wxzlib$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
-        <!-- For regex we won't use the WX3RDPARTYLIBPOSTIX postfix:
+        <sys-lib cond="FORMAT!='msevc4prj'">wxtiff$(WX3RDPARTYLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxjpeg$(WX3RDPARTYLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxpng$(WX3RDPARTYLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxzlib$(WX3RDPARTYLIBPOSTFIX)</sys-lib> 
+        <!-- For regex we won't use the WX3RDPARTYLIBPOSTIX 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 cond="FORMAT!='msevc4prj'">wxregex$(WXLIBPOSTFIX)</sys-lib> 
         <sys-lib>wxexpat$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
 
         <!-- link-in system libs that wx depends on: -->
-- 
2.45.2