]> git.saurik.com Git - wxWidgets.git/commitdiff
some 3rd party libs are not buildable under eVC, don't link against them
authorVáclav Slavík <vslavik@fastmail.fm>
Thu, 16 Jun 2005 18:40:20 +0000 (18:40 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Thu, 16 Jun 2005 18:40:20 +0000 (18:40 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

build/bakefiles/wxpresets/presets/wx_win32.bkl

index 992eab2e932a614e7fd9ef1552a123c4c5357866..fa5fb027347c78ddddc43ac4c1cbe3bcca61cd6a 100644 (file)
@@ -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: -->