Removed dummy wxFont == operator implementation (IIRC was needed to compile with...

[wxWidgets.git] / build / bakefiles / wxpresets / presets / wx.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl
index fc8834470323c6d1561e5eef2c0a02d5f0c47f43..31778ddabe26588b49e0eb9e0cbe19124cd6072c 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -87,6 +87,7 @@
 
         <wx-lib>richtext</wx-lib>
         <wx-lib>aui</wx-lib>
 
         <wx-lib>richtext</wx-lib>
         <wx-lib>aui</wx-lib>

+        <wx-lib>propgrid</wx-lib>

         <wx-lib>stc</wx-lib>
         <wx-lib>qa</wx-lib>
         <wx-lib>gl</wx-lib>
         <wx-lib>stc</wx-lib>
         <wx-lib>qa</wx-lib>
         <wx-lib>gl</wx-lib>


@@ -117,7 +118,7 @@
                          tag definitions.
     -->
     <set var="WX_LIB_LIST">
                          tag definitions.
     -->
     <set var="WX_LIB_LIST">

-        base core net xml xrc html adv media gl qa aui richtext stc
+        base core net xml xrc html adv media gl qa aui propgrid richtext stc

     </set>
 
     <!-- if you define this variable to 0 before including wx presets, the
     </set>
 
     <!-- if you define this variable to 0 before including wx presets, the


@@ -245,7 +246,7 @@
     <!-- The directory where wxWidgets is installed: -->
     <if cond="not isdefined('WX_DIR')">
         <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
     <!-- The directory where wxWidgets is installed: -->
     <if cond="not isdefined('WX_DIR')">
         <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>

-        <option name="WX_DIR" category="path">
+        <option name="WX_DIR" category="path" never_empty="1">

             <default-value>$(WX_DIR_DEFAULT)</default-value>
             <description>
                 The directory where wxWidgets library is installed
             <default-value>$(WX_DIR_DEFAULT)</default-value>
             <description>
                 The directory where wxWidgets library is installed


@@ -321,10 +322,14 @@
             <debug-info>$(_DEBUGINFO)</debug-info>
         </if>
     </template>
             <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">
 
     <!-- Template for building wx-based console applications -->
     <template id="wxconsole" template="wx">

-        <define>wxUSE_GUI=0</define>

         <app-type>console</app-type>
     </template>
 
         <app-type>console</app-type>
     </template>
 


@@ -531,4 +536,7 @@
         </if>
     </define-global-tag>
 
         </if>
     </define-global-tag>
 

+
+    <include file="wx_xrc.bkl"/>
+

 </makefile>
 </makefile>