Destroy the wxDialog::ShowWindowModalThenDo() functor a.s.a.p.

[wxWidgets.git] / build / bakefiles / Bakefiles.bkgen

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index 9e677354bdaefcc5b9d21ea5a4cf88f36fdd090f..ba7469ef72b5e626ed2258b5264a1eca6ae80cdd 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
 <?xml version="1.0" ?>

-<!-- $Id$ -->

 
 <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
 
 
 <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">
 


@@ -9,7 +8,7 @@
     Bakefiles.local.bkgen file in this directory and add <enable-formats>
     into it:
          <?xml version="1.0" ?>
     Bakefiles.local.bkgen file in this directory and add <enable-formats>
     into it:
          <?xml version="1.0" ?>

-         <bakefile-gen>
+         <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">

              <enable-formats>dmars</enable-formats>
          </bakefile-gen>
 
              <enable-formats>dmars</enable-formats>
          </bakefile-gen>
 


@@ -35,7 +34,7 @@
         ../../utils/*/*.bkl
         ../../utils/*/*/*.bkl
         ../../tests/*.bkl
         ../../utils/*/*.bkl
         ../../utils/*/*/*.bkl
         ../../tests/*.bkl

-        ../../tests/benchmarks/bench.bkl
+        ../../tests/*/*.bkl

     </input>
 
     <!-- List of output formats to generate: -->
     </input>
 
     <!-- List of output formats to generate: -->


@@ -62,16 +61,23 @@
     <!-- WinCE can't have console apps: -->
     <del-formats files="../../samples/console/*">msevc4prj</del-formats>
     <del-formats files="../../samples/sockets/*">msevc4prj</del-formats>
     <!-- WinCE can't have console apps: -->
     <del-formats files="../../samples/console/*">msevc4prj</del-formats>
     <del-formats files="../../samples/sockets/*">msevc4prj</del-formats>

+    <del-formats files="../../utils/execmon/*">msevc4prj</del-formats>

     <del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
     <del-formats files="../../utils/ifacecheck/src/*">msevc4prj</del-formats>
     <del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
     <del-formats files="../../tests/*">msevc4prj</del-formats>
     <del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
     <del-formats files="../../utils/ifacecheck/src/*">msevc4prj</del-formats>
     <del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
     <del-formats files="../../tests/*">msevc4prj</del-formats>

+    <del-formats files="../../tests/benchmarks/*">msevc4prj</del-formats>
+

 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
     <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
         borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
     </del-formats>
 
 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
     <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
         borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
     </del-formats>
 

+    <!-- Some samples use MSVC-specific stuff -->
+    <del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
+        autoconf,borland,dmars_smake,dmars,mingw,msevc4prj,watcom
+    </del-formats>

 
     <!-- Default flags (for all formats and bakefiles): -->
     <add-flags>-Iformats</add-flags>
 
     <!-- Default flags (for all formats and bakefiles): -->
     <add-flags>-Iformats</add-flags>


@@ -126,15 +132,15 @@
 
 
     <!-- Use different names for Visual C++ 200x project files: -->
 
 
     <!-- Use different names for Visual C++ 200x project files: -->

-    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*"
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"

                formats="msvs2003prj">
         -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc7.sln
     </add-flags>
                formats="msvs2003prj">
         -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc7.sln
     </add-flags>

-    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*"
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"

                formats="msvs2005prj">
         -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc8.sln
     </add-flags>
                formats="msvs2005prj">
         -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc8.sln
     </add-flags>

-    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*"
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"

                formats="msvs2008prj">
         -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc9.sln
     </add-flags>
                formats="msvs2008prj">
         -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc9.sln
     </add-flags>


@@ -251,12 +257,15 @@
     <add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
         gnu
     </add-formats>
     <add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
         gnu
     </add-formats>

+    <del-formats files="../../samples/flash/flash.bkl,../../samples/mfc/mfc.bkl">
+        gnu
+    </del-formats>

     <add-flags files="../../samples/*/*.bkl,../../samples/*/*/*.bkl"
                formats="gnu">
         -DOUT_OF_TREE_MAKEFILES=1 -o$(INPUT_FILE_DIR)/makefile.unx
     </add-flags>
 
     <add-flags files="../../samples/*/*.bkl,../../samples/*/*/*.bkl"
                formats="gnu">
         -DOUT_OF_TREE_MAKEFILES=1 -o$(INPUT_FILE_DIR)/makefile.unx
     </add-flags>
 

-    <!-- Personal customizations (not in CVS): -->
+    <!-- Personal customizations (not in VCS): -->

     <include file="Bakefiles.local.bkgen" ignore_missing="1"/>
 
 </bakefile-gen>
     <include file="Bakefiles.local.bkgen" ignore_missing="1"/>
 
 </bakefile-gen>