From 92a93d4659f5f6f4f8be061ad55346db2e615e45 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Thu, 13 Dec 2007 00:58:56 +0000
Subject: [PATCH] added 'wxgui' template to make writing makefiles for gui apps
 a bit easier

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/wxpresets/bakefile_quickstart.txt | 11 +++++++----
 build/bakefiles/wxpresets/presets/wx.bkl          |  6 +++++-
 build/bakefiles/wxpresets/sample/minimal.bkl      |  3 +--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/build/bakefiles/wxpresets/bakefile_quickstart.txt b/build/bakefiles/wxpresets/bakefile_quickstart.txt
index 729fa5380f..0637035bbd 100644
--- a/build/bakefiles/wxpresets/bakefile_quickstart.txt
+++ b/build/bakefiles/wxpresets/bakefile_quickstart.txt
@@ -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
diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl
index e2b6bdf485..bb2a8d8d3f 100644
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -321,10 +321,14 @@
             <debug-info>$(_DEBUGINFO)</debug-info>
         </if>
     </template>
+    
+    <!-- Template for building wx-based GUI applications -->
+    <template id="wxgui" template="wx">
+        <app-type>gui</app-type>
+    </template>
 
     <!-- Template for building wx-based console applications -->
     <template id="wxconsole" template="wx">
-        <define>wxUSE_GUI=0</define>
         <app-type>console</app-type>
     </template>
 
diff --git a/build/bakefiles/wxpresets/sample/minimal.bkl b/build/bakefiles/wxpresets/sample/minimal.bkl
index 2a0152b6b4..1b69759b4a 100644
--- a/build/bakefiles/wxpresets/sample/minimal.bkl
+++ b/build/bakefiles/wxpresets/sample/minimal.bkl
@@ -5,8 +5,7 @@
 
     <include file="presets/wx.bkl"/>
 
-    <exe id="minimal" template="wx">
-        <app-type>gui</app-type>
+    <exe id="minimal" template="wxgui">
 
         <!-- this sample builds always in debug mode; if you have
              compiled wxWidgets in release mode, you'll get link errors! -->
-- 
2.45.2