fix GCC warning

[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 ae522769d7bf28914e93c0dc2d9bdb7e504e5180..9a22a95ce9e74d2950671c04742181df11ea6cf7 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -10,7 +10,7 @@
 
     - WX_* : used to let the user of the generated makefile choose a wxWidgets
              build among those available; you can use them in your project to
 
     - WX_* : used to let the user of the generated makefile choose a wxWidgets
              build among those available; you can use them in your project to

-             e.g. build a target only if WX_DEBUG is 0 or if WX_PORT is "msw".
+             e.g. build a target only if WX_SHARED is 0 or if WX_PORT is "msw".

 
 
     VARIABLES:
 
 
     VARIABLES:


@@ -24,7 +24,8 @@
 
     - 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 necessary preprocessor
+                  symbols, etc).

 
     - wxgui: to be used when building GUI-mode applications.
 
 
     - wxgui: to be used when building GUI-mode applications.
 


@@ -33,7 +34,7 @@
                  need it when compiling wxBase-only code).
 
     - wxlike: this template should be combined with "wx" or "wx-lib" and will
                  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
+              make your project build with the same Unicode & shared

               config as the wxWidgets build selected using the WX_* options.
 
 
               config as the wxWidgets build selected using the WX_* options.
 
 


@@ -90,6 +91,7 @@
 
         <wx-lib>richtext</wx-lib>
         <wx-lib>aui</wx-lib>
 
         <wx-lib>richtext</wx-lib>
         <wx-lib>aui</wx-lib>

+        <wx-lib>ribbon</wx-lib>

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


@@ -110,6 +112,7 @@
 
     <requires version="0.2.2"/>
 
 
     <requires version="0.2.2"/>
 

+    <using module="wx_presets"/>

 
     <!-- this variable identifies the version of the wx presets.
          this is changed only when major changes to wxpresets take place.
 
     <!-- this variable identifies the version of the wx presets.
          this is changed only when major changes to wxpresets take place.


@@ -121,7 +124,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 propgrid richtext stc
+        base core net xml xrc html adv media gl qa aui ribbon 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


@@ -176,7 +179,6 @@
     <!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
     <if cond="FORMAT=='gnu'">
         <set var="WX_UNICODE"/>
     <!-- 'gnu' format needs to redefine the following options later in wx_unix.bkl -->
     <if cond="FORMAT=='gnu'">
         <set var="WX_UNICODE"/>

-        <set var="WX_DEBUG"/>

         <set var="WX_SHARED"/>
         <set var="WX_PORT"/>
         <set var="WX_VERSION"/>
         <set var="WX_SHARED"/>
         <set var="WX_PORT"/>
         <set var="WX_VERSION"/>


@@ -219,7 +221,7 @@
             <values-description>Release,Debug</values-description>
             <default-value>$(WX_DEBUG_DEFAULT)</default-value>
             <description>
             <values-description>Release,Debug</values-description>
             <default-value>$(WX_DEBUG_DEFAULT)</default-value>
             <description>

-                Use debug build of wxWidgets (define __WXDEBUG__)?
+                Use debug build of wxWidgets (linked with debug CRT)?

             </description>
         </option>
     </if>
             </description>
         </option>
     </if>


@@ -271,6 +273,10 @@
         <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
     </set>
 
         <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
     </set>
 

+    <if cond="FORMAT!='autoconf'">
+        <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
+    </if>
+

 
 
 
 
 
 


@@ -384,7 +390,7 @@
     </define-tag>
 
     <!-- Sets as output folder for the current target a directory
     </define-tag>
 
     <!-- Sets as output folder for the current target a directory

-         called "$(value)/$(COMPILER)_lib|dll", just like wxWidgets does.
+         called "$(value)/$(COMPILER_PREFIX)_lib|dll", just like wxWidgets does.

          This makes it possible to keep separed the libraries/exes compiled with
          different compilers and with a different value for WX_SHARED.
     -->
          This makes it possible to keep separed the libraries/exes compiled with
          different compilers and with a different value for WX_SHARED.
     -->


@@ -395,7 +401,7 @@
                 <if cond="WX_SHARED=='1'">dll</if>
             </set>
             <set var="_DIRNAME">
                 <if cond="WX_SHARED=='1'">dll</if>
             </set>
             <set var="_DIRNAME">

-                $(value)/$(COMPILER)_$(_DIRNAME_SHARED_SUFFIX)
+                $(value)/$(COMPILER_PREFIX)_$(_DIRNAME_SHARED_SUFFIX)

             </set>
 
             <dirname>$(_DIRNAME)</dirname>
             </set>
 
             <dirname>$(_DIRNAME)</dirname>


@@ -478,7 +484,7 @@
             </set>
 
             <set var="BUILDDIR">
             </set>
 
             <set var="BUILDDIR">

-                $(COMPILER)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
+                $(COMPILER_PREFIX)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)

             </set>
         </if>
     </define-global-tag>
             </set>
         </if>
     </define-global-tag>