X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc2ae3558358c13b3944239dfb6536bf45453d2c..fe97acf0e3b423984fb615c0ce060d9f00f6f0f8:/build/bakefiles/Bakefiles.bkgen?ds=sidebyside

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index 2c2f3caf7d..66629a7f71 100644
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -35,31 +35,28 @@
         ../../utils/*/*.bkl
         ../../utils/*/*/*.bkl
         ../../tests/*.bkl
-        ../../tests/benchmarks/bench.bkl
+        ../../tests/*/*.bkl
     </input>
 
     <!-- List of output formats to generate: -->
     <add-formats>
-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,watcom
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj,watcom
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">
-        autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
+        autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../demos/*.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
-    </del-formats>
-    <del-formats files="../../samples/mobile/mobile_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
     <del-formats files="../../utils/*.bkl">
-        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,msvs2008prj
     </del-formats>
 
     <!-- WinCE can't have console apps: -->
@@ -69,12 +66,17 @@
     <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,watcom
+        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>
@@ -111,6 +113,9 @@
     <add-flags files="wx.bkl" formats="msvs2005prj">
         -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>
@@ -125,17 +130,19 @@
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
-    <!-- Use different names for Visual C++ 2003 project files: -->
-    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*"
+    <!-- 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>
-
-    <!-- Use different names for Visual C++ 2005 project files: -->
-    <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>
+    <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: -->
 
@@ -249,12 +256,15 @@
     <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>
 
-    <!-- Personal customizations (not in CVS): -->
+    <!-- Personal customizations (not in VCS): -->
     <include file="Bakefiles.local.bkgen" ignore_missing="1"/>
 
 </bakefile-gen>