From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 8 Jun 2012 18:44:10 +0000 (+0000)
Subject: Use PLATFORM checks in bakefiles instead of TOOLKIT checks.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5c3f21c6a3450b92810202f7d50f5f4b3d993309

Use PLATFORM checks in bakefiles instead of TOOLKIT checks.

No real changes as the output is currently the same for all supported
PLATFORM/TOOLKIT combinations anyhow but prefer checking for PLATFORM to
prepare for the support of GTK toolkit under MSW platform.

Closes #14379.

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

diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index f606fb54e8..f158dbcb19 100644
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -8,8 +8,7 @@
     the library.
     -->
 
-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'] and
-              TOOLKIT in ['PM','MSW','MOTIF']">
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 2ada7a726e..756148cbe9 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -424,7 +424,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
                     univ/setup.h
                 </msvc-headers-setup-h>
                 <set var="_custom_build_include_wx_msw_setup_h">
-                    <if cond="WXUNIV=='0'">
+                    <if cond="WXUNIV=='0' and TOOLKIT=='MSW'">
                         $(msvc_copy_setup_h_script % 'msw\setup.h')
                     </if>
                 </set>
@@ -614,7 +614,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <define>WXBUILDING</define>
 
         <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
-            <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','PM','WINCE']">
+            <if cond="FORMAT!='autoconf'">
                 <sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
                 <precomp-headers-gen>
                     $(WXTOPDIR)src/common/dummy.cpp
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 062df3eb45..b806cd704e 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -40,7 +40,7 @@
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MOTIF']">../../samples</dir>
+        <dir cond="FORMAT!='autoconf'">../../samples</dir>
     </subproject>
 
     <if cond="FORMAT=='autoconf'">
@@ -194,8 +194,8 @@
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
-            <if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if>
-            <if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if>
+            <if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if>
+            <if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if>
         </set>
 
         <copy-file-to-file-if-not-exist id="master_setup.h">
@@ -212,7 +212,7 @@
 
 
     <!-- create rcdefs.h on Windows: -->
-    <if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
+    <if cond="FORMAT in ['borland','mingw','msvc','watcom']">
 
         <mkdir id="libdir_setup_wx_msw">
             <depends>libdir_setup_wx</depends>