More ports in non autoconf formats.

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

diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index 82acf5dfe0dd44b4aa68d61142c3221edf7b3ba6..cea46c0497771d29dc1b8eaf9f2fc85079c3b99f 100644 (file)
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -8,7 +8,8 @@
     the library.
     -->
 
     the library.
     -->
 

-    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL'] and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','cbuilderx'] and
+              TOOLKIT in ['PM','MSW','MGL','MOTIF']">

 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg
 
         <set var="BUILD_CFG_FILE" make_var="1">
             $(SETUPHDIR)$(DIRSEP)build.cfg

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 636c27eb9dec576c31ac9732f0371475aef0a690..2a1555f72fa5406acfde3f85b0589f50b1ca3d99 100644 (file)
--- 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>
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>

-        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL']">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>

     </subproject>
 
     <if cond="FORMAT=='autoconf'">
     </subproject>
 
     <if cond="FORMAT=='autoconf'">


@@ -159,7 +159,7 @@
 
 
     <!-- copy setup.h on DOS/OS2/Windows: -->
 
 
     <!-- copy setup.h on DOS/OS2/Windows: -->

-    <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL']">
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">

         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>