From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 25 Dec 2008 18:49:29 +0000 (+0000)
Subject: avoid bakefile warnings about actions unsupported in MSVS formats by not using them... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b158f13e16f4b5fe5d60724f3a6e48c84127f919

avoid bakefile warnings about actions unsupported in MSVS formats by not using them in this case (this doesn't change the generated project files anyhow)

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index fb2d87699e..07f482ee13 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -24,7 +24,7 @@
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
 
-    <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
+    <if cond="IS_MSVC_PRJ">
         <set var="MSVC6PRJ_MERGED_TARGETS">
             <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
             <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
@@ -171,8 +171,8 @@
     </if>
 
 
-    <!-- copy setup.h on DOS/OS2/Windows: -->
-    <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
+    <!-- copy setup.h on DOS/OS2/Windows if the format supports it: -->
+    <if cond="FORMAT!='autoconf' and IS_MSVC_PRJ=='0' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
@@ -202,7 +202,6 @@
             <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
             <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
-
     </if>