Merge in from trunk r68684 - r69046

[wxWidgets.git] / build / bakefiles / wxpresets / bakefile_quickstart.txt

diff --git a/build/bakefiles/wxpresets/bakefile_quickstart.txt b/build/bakefiles/wxpresets/bakefile_quickstart.txt
index 729fa5380f760a48e82f9a0d81cd721cb7a1b9c1..b7717117475e6e027c76511ca08e094cf161b271 100644 (file)
--- a/build/bakefiles/wxpresets/bakefile_quickstart.txt
+++ b/build/bakefiles/wxpresets/bakefile_quickstart.txt
@@ -5,7 +5,7 @@ The 10-minute, do-it-yourself wx project baking guide (with free sample recipes!
 Status: DRAFT
 Author: Kevin Ollivier
 Date: 2/13/04
-License: wxWidgets License
+Licence: wxWindows Licence
 -----------------------------------------------------------------------
 
 Supporting many different platforms can be a difficult challenge. The
@@ -76,8 +76,7 @@ minimal.bkl
 
     <include file="presets/wx.bkl"/>
 
-    <exe id="minimal" template="wx">
-        <app-type>gui</app-type>
+    <exe id="minimal" template="wxgui">
         <debug-info>on</debug-info>
         <runtime-libs>dynamic</runtime-libs>
 
@@ -217,8 +216,12 @@ In order to build the software in debug mode.
 To simplify the building of wxWidgets-based projects, wxWidgets contains a
 set of Bakefiles that automatically configure your build system to be
 compatible with wxWidgets. As you'll notice in the sample above, the sample
-project uses the wx template. Once you've included the template, your software
-will now build with wxWidgets support.
+project uses the "wxgui" template. Once you've included the template, your software
+will now build as a GUI application with wxWidgets support.
+
+There's also "wxconsole" template for building console-based wxWidgets applications
+and "wx" template that doesn't specify application type (GUI or console) and can be
+used e.g. for building libraries that use wxWidgets.
 
 But since the wx presets don't exist in the Bakefile presets subfolder,
 Bakefile needs to know where to find these presets. The "-I" command adds the