Correct wxImage::Size() again; add unit tests for it.

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

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index 2d6a3ac40ad191536ea2be6030c34bd9eac4bb42..66629a7f71a67866719c256a84f3d58ea5c6a3db 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -25,7 +25,6 @@
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
         wx.bkl
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
         wx.bkl

-        ../../contrib/build/*/*.bkl

         ../../samples/*.bkl
         ../../samples/*/*.bkl
         ../../samples/*/*/*.bkl
         ../../samples/*.bkl
         ../../samples/*/*.bkl
         ../../samples/*/*/*.bkl


@@ -35,49 +34,49 @@
         ../../utils/*.bkl
         ../../utils/*/*.bkl
         ../../utils/*/*/*.bkl
         ../../utils/*.bkl
         ../../utils/*/*.bkl
         ../../utils/*/*/*.bkl

-        ../../contrib/samples/*.bkl
-        ../../contrib/samples/*/*.bkl
-        ../../contrib/samples/*/*/*.bkl
-        ../../contrib/utils/*/*.bkl

         ../../tests/*.bkl
         ../../tests/*.bkl

+        ../../tests/*/*.bkl

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

-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom

     </add-formats>
 
     <del-formats files="../../samples/*.bkl">
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">

-        autoconf,msvc6prj,msevc4prj,msvs2005prj
+        autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj

     </del-formats>
     <del-formats files="../../demos/*.bkl">
     </del-formats>
     <del-formats files="../../demos/*.bkl">

-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj

     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">

-        msvc6prj,msevc4prj,msvs2005prj
-    </del-formats>
-    <del-formats files="../../samples/mobile/mobile_samples.bkl">
-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj

     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">

-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj

     </del-formats>
     <del-formats files="../../utils/*.bkl">
     </del-formats>
     <del-formats files="../../utils/*.bkl">

-        msvc6prj,msevc4prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj

     </del-formats>
 
     <!-- WinCE can't have console apps: -->
     <del-formats files="../../samples/console/*">msevc4prj</del-formats>
     </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/HelpGen/src/*">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="../../utils/wxrc/*">msevc4prj</del-formats>

-    <del-formats files="../../contrib/utils/wxrc/*">msevc4prj</del-formats>

     <del-formats files="../../tests/*">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">
 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
     <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">

-        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom

     </del-formats>
 
     </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>


@@ -108,19 +107,18 @@
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>

+    <add-flags files="wx.bkl" formats="msvs2003prj">
+        -o../msw/wx_vc7.sln
+    </add-flags>

     <add-flags files="wx.bkl" formats="msvs2005prj">
     <add-flags files="wx.bkl" formats="msvs2005prj">

-        -o../msw/wx.sln
+        -o../msw/wx_vc8.sln
+    </add-flags>
+    <add-flags files="wx.bkl" formats="msvs2008prj">
+        -o../msw/wx_vc9.sln

     </add-flags>
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>
     </add-flags>
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>

-    <add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
-    </add-flags>
-    <add-flags files="../../contrib/build/*/*.bkl"
-               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
-        -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
-    </add-flags>

 
 
 
 
 
 


@@ -132,6 +130,20 @@
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 

+    <!-- Use different names for Visual C++ 200x project files: -->
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"
+               formats="msvs2003prj">
+        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc7.sln
+    </add-flags>
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"
+               formats="msvs2005prj">
+        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc8.sln
+    </add-flags>
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*,../../tests/*/*"
+               formats="msvs2008prj">
+        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc9.sln
+    </add-flags>
+

     <!-- Makefile specific settings: -->
 
     <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
     <!-- Makefile specific settings: -->
 
     <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">


@@ -239,17 +251,20 @@
         -DOPTIONS_FILE=../../../../build/msw/config.wat
     </add-flags>
 
         -DOPTIONS_FILE=../../../../build/msw/config.wat
     </add-flags>
 

-    
+

     <!-- Makefiles for out-of-tree building of samples on Unix: -->
     <add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
         gnu
     </add-formats>
     <!-- Makefiles for out-of-tree building of samples on Unix: -->
     <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>