Removed queuedResize code again as GTK+ does this internally already

[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 4e11c306fd6633ecc4bdb43c3dad89376f9024c5..ae522769d7bf28914e93c0dc2d9bdb7e504e5180 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -24,10 +24,13 @@
 
     - wx, wx-lib: templates to be used respectively for <dll>/<exe> and <lib>
                   targets; they add all the wxWidgets-related settings (e.g. the
 
     - wx, wx-lib: templates to be used respectively for <dll>/<exe> and <lib>
                   targets; they add all the wxWidgets-related settings (e.g. the

-                  include and library search paths, the __WXDEBUG__ symbol, etc)
+                  include and library search paths, the __WXDEBUG__ symbol, etc).

 
 

-    - wxconsole: to be used when building console-only libraries or apps
-                 (adds the wxUSE_GUI=0 define).
+    - wxgui: to be used when building GUI-mode applications.
+
+    - wxconsole: to be used when building console-only applications
+                 (NOTE: it doesn't add the wxUSE_GUI=0 define since you don't
+                 need it when compiling wxBase-only code).

 
     - wxlike: this template should be combined with "wx" or "wx-lib" and will
               make your project build with the same Unicode, debug & shared
 
     - wxlike: this template should be combined with "wx" or "wx-lib" and will
               make your project build with the same Unicode, debug & shared


@@ -63,7 +66,7 @@
     - <wxlike-dirname>: sets the output directory for the current target to $(value)
                         when on Unix and to e.g. $(value)/vc_lib when on Windows,
                         i.e. acts like <dirname> just following wxWidgets naming rules.
     - <wxlike-dirname>: sets the output directory for the current target to $(value)
                         when on Unix and to e.g. $(value)/vc_lib when on Windows,
                         i.e. acts like <dirname> just following wxWidgets naming rules.

-                        Useful to allow multiple builds of the 
+                        Useful to allow multiple builds of the

 
     - <wxlike-paths>: if your library/application needs to compile & link with both
                       wxWidgets and some other wx-based library, which in turn
 
     - <wxlike-paths>: if your library/application needs to compile & link with both
                       wxWidgets and some other wx-based library, which in turn


@@ -87,11 +90,10 @@
 
         <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>stc</wx-lib>
         <wx-lib>qa</wx-lib>

-        <wx-lib>dbgrid</wx-lib>

         <wx-lib>gl</wx-lib>
         <wx-lib>gl</wx-lib>

-        <wx-lib>odbc</wx-lib>

         <wx-lib>xrc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>media</wx-lib>
         <wx-lib>xrc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>media</wx-lib>


@@ -110,24 +112,27 @@
 
 
     <!-- this variable identifies the version of the wx presets.
 
 
     <!-- this variable identifies the version of the wx presets.

-         this is changed only when major changes to wxpresets take place. -->
+         this is changed only when major changes to wxpresets take place.
+    -->

     <set var="WX_PRESETS_VERSION">4</set>
 
     <!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl
          VERY IMPORTANT: when updating this list also update the <wx-lib> and <wx-all-libs>
                          tag definitions.
     -->
     <set var="WX_PRESETS_VERSION">4</set>
 
     <!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl
          VERY IMPORTANT: when updating this list also update the <wx-lib> and <wx-all-libs>
                          tag definitions.
     -->

-    <set var="LIB_LIST">
-        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc
+    <set var="WX_LIB_LIST">
+        base core net xml xrc html adv media gl qa aui propgrid richtext stc

     </set>
 
     </set>
 

-    <!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
-               (which is already in LIB_LIST)
+    <!-- if you define this variable to 0 before including wx presets, the
+         "test_for_selected_wxbuild" target which is added by default in win32 and GNU
+         makefiles, won't be added.
+         This is useful when e.g. you want to have wxWidgets as an optional
+         dependency and thus you don't want to perform that check unconditionally.

     -->
     -->

-    <set var="CONTRIBLIB_LIST">
-        applet deprecated fl foldbar gizmos mmedia netutils ogl plot stc svg
+    <set var="WX_TEST_FOR_SELECTED_WXBUILD" overwrite="0">
+        1

     </set>
     </set>

-    <set var="ALLLIB_LIST">$(LIB_LIST) $(CONTRIBLIB_LIST)</set>

 
     <!-- this is a temporary variable until there is non general    -->
     <!-- function in bakefiles for returning native markup for      -->
 
     <!-- this is a temporary variable until there is non general    -->
     <!-- function in bakefiles for returning native markup for      -->


@@ -163,7 +168,7 @@
 
     <!-- Presets for limited dmars make.exe format: -->
     <if cond="FORMAT=='dmars'">
 
     <!-- Presets for limited dmars make.exe format: -->
     <if cond="FORMAT=='dmars'">

-        <set var="WX_UNICODE">0</set>
+        <set var="WX_UNICODE">1</set>

         <set var="WX_DEBUG">1</set>
         <set var="WX_SHARED">0</set>
     </if>
         <set var="WX_DEBUG">1</set>
         <set var="WX_SHARED">0</set>
     </if>


@@ -196,7 +201,7 @@
     <!-- Configuration for building the bakefile with               -->
     <!-- unicode strings or not (unicode or ansi).                  -->
     <if cond="not isdefined('WX_UNICODE')">
     <!-- Configuration for building the bakefile with               -->
     <!-- unicode strings or not (unicode or ansi).                  -->
     <if cond="not isdefined('WX_UNICODE')">

-        <set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
+        <set var="WX_UNICODE_DEFAULT" overwrite="0">1</set>

         <option name="WX_UNICODE">
             <values>0,1</values>
             <values-description>ANSI,Unicode</values-description>
         <option name="WX_UNICODE">
             <values>0,1</values>
             <values-description>ANSI,Unicode</values-description>


@@ -244,7 +249,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


@@ -269,7 +274,8 @@
 
 
 
 
 
 

-    <!-- this is just a wrapper that includes the real implementation: -->
+    <!--                    REAL IMPLEMENTATION                     -->
+    <!--                                                            -->

 
     <set var="__wx_included_impl">0</set>
 
 
     <set var="__wx_included_impl">0</set>
 


@@ -283,6 +289,13 @@
         <set var="__wx_included_impl">1</set>
     </if>
 
         <set var="__wx_included_impl">1</set>
     </if>
 

+    <if cond="FORMAT=='xcode2'">
+        <!-- xCode2 is an IDE and thus reuses almost nothing from unix part of wxpresets;
+             better use the win32 part! -->
+        <include file="wx_win32.bkl"/>
+        <set var="__wx_included_impl">1</set>
+    </if>
+

     <if cond="__wx_included_impl=='0'">
         <error>This format is not (yet) supported by wx preset.</error>
     </if>
     <if cond="__wx_included_impl=='0'">
         <error>This format is not (yet) supported by wx preset.</error>
     </if>


@@ -313,9 +326,13 @@
         </if>
     </template>
 
         </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>
 


@@ -394,7 +411,7 @@
                     <command cond="TOOLSET in ['win32','os2','dos']">
                         if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
                     </command>
                     <command cond="TOOLSET in ['win32','os2','dos']">
                         if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
                     </command>

-            </modify-target>
+                </modify-target>

 
                 <!-- the following code is mostly equivalent to a:
                           <dependency-of>$(id)</dependency-of>
 
                 <!-- the following code is mostly equivalent to a:
                           <dependency-of>$(id)</dependency-of>


@@ -420,7 +437,7 @@
     </define-tag>
 
     <!-- Adds to the compiler & linker flags the path for the "include" and the
     </define-tag>
 
     <!-- Adds to the compiler & linker flags the path for the "include" and the

-         "lib" folders of a library following wxWidgets conventions which is 
+         "lib" folders of a library following wxWidgets conventions which is

          located in $(value).
     -->
     <define-tag name="wxlike-paths" rules="exe,lib,dll,module">
          located in $(value).
     -->
     <define-tag name="wxlike-paths" rules="exe,lib,dll,module">


@@ -522,4 +539,7 @@
         </if>
     </define-global-tag>
 
         </if>
     </define-global-tag>
 

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

 </makefile>
 </makefile>