removed samples topic overview; the samples are part of mainpages/utilities.h now

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

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index 70a4fbcb1167ac495450f1774b8fb0e6b68dd867..ce2cb4fac91d5aea79014ce297fe68632cf1b3a2 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -19,13 +19,12 @@
                 we don't want to clutter the source tree with these files.
     -->
 
                 we don't want to clutter the source tree with these files.
     -->
 

-    <disable-formats>dmars,dmars_smake,msevc4prj,msvs2003prj</disable-formats>
+    <disable-formats>dmars,dmars_smake,msevc4prj</disable-formats>

 
 
     <!-- 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,10 +34,6 @@
         ../../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
     </input>
 
         ../../tests/*.bkl
     </input>
 


@@ -68,9 +63,9 @@
 
     <!-- WinCE can't have console apps: -->
     <del-formats files="../../samples/console/*">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/HelpGen/src/*">msevc4prj</del-formats>
     <del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
     <del-formats files="../../utils/HelpGen/src/*">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>
 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
     <del-formats files="../../tests/*">msevc4prj</del-formats>
 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->


@@ -108,22 +103,15 @@
     <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="msvs2005prj">
-        -o../msw/wx.sln
-    </add-flags>

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

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

     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </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,msvs2003prj,msvs2005prj">
-        -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
-    </add-flags>

 
 
 
 
 
 


@@ -140,6 +128,12 @@
                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>

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

 
     <!-- Makefile specific settings: -->
 
 
     <!-- Makefile specific settings: -->