X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4106e3b2f1e6a4999c991dd35c33d5c0ed1bd0b..192c3efa7f0ee383ec5e5c12877627d6c20498a7:/build/bakefiles/wxpresets/presets/wx.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl
index 71a2bef576..9a22a95ce9 100644
--- 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
-             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:
@@ -24,13 +24,17 @@
 
     - 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).
 
-    - 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
+              make your project build with the same Unicode & shared
               config as the wxWidgets build selected using the WX_* options.
 
 
@@ -60,10 +64,10 @@
                     follows the wxWidgets naming conventions, then this tag is
                     what you need to reference the wx-based additional library.
 
-    - <wxlike-libdirname>: 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 
+    - <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
 
     - <wxlike-paths>: if your library/application needs to compile & link with both
                       wxWidgets and some other wx-based library, which in turn
@@ -78,16 +82,20 @@
                              to keep object files compiled with different
                              settings separate.
 
+    - <set-wxlike>: sets a variable with the name of a library named with the same
+                    wxWidgets rules.
+
 
  NOTE: as a reference here is a list of all wxWidgets libraries satisfying
        the dependency constraints mentioned in <wx-lib> description:
 
         <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>dbgrid</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>
@@ -104,26 +112,30 @@
 
     <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 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="LIB_LIST">
-        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext
+    <set var="WX_LIB_LIST">
+        base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc
     </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 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      -->
@@ -159,7 +171,7 @@
 
     <!-- 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>
@@ -167,7 +179,6 @@
     <!-- '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"/>
@@ -184,7 +195,7 @@
             <values-description>Static,DLL</values-description>
             <default-value>$(WX_SHARED_DEFAULT)</default-value>
             <description>
-                Use DLL build of wx library to use?
+                Use DLL build of wx library?
             </description>
         </option>
     </if>
@@ -192,13 +203,13 @@
     <!-- 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>
             <default-value>$(WX_UNICODE_DEFAULT)</default-value>
             <description>
-                Compile Unicode build of wxWidgets?
+                Use Unicode build of wxWidgets?
             </description>
         </option>
     </if>
@@ -210,7 +221,7 @@
             <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>
@@ -240,7 +251,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>
-        <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
@@ -262,10 +273,15 @@
         <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>
+
 
 
 
-    <!-- this is just a wrapper that includes the real implementation: -->
+    <!--                    REAL IMPLEMENTATION                     -->
+    <!--                                                            -->
 
     <set var="__wx_included_impl">0</set>
 
@@ -279,6 +295,13 @@
         <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>
@@ -309,9 +332,13 @@
         </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>
 
@@ -320,8 +347,11 @@
     <!--                       UTILITY TAGS                         -->
     <!--                                                            -->
 
-    <!-- private helper tag -->
-    <define-tag name="__setlibname" rules="lib,dll,module">
+    <!-- private helper tag: does the same thing as for <set-wxlike> except that:
+         - the variable created is always named "__temp"
+         - can be used (only) inside targets as this is a non-global tag
+    -->
+    <define-tag name="__setlibname" rules="lib,dll,module,exe">
         <set var="__temp">
             <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
                 $(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
@@ -359,25 +389,25 @@
         <sys-lib>$(__temp)</sys-lib>
     </define-tag>
 
-    <!-- Sets as output folder for the generated lib/dll a directory
-         called "lib/$(COMPILER)_lib|dll", just like wxWidgets does.
-         This makes it possible to keep separed the libraries compiled with
+    <!-- Sets as output folder for the current target a directory
+         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.
     -->
-    <define-tag name="wxlike-libdirname" rules="lib,dll">
+    <define-tag name="wxlike-dirname" rules="lib,dll,exe,module">
         <if cond="FORMAT!='autoconf'">
             <set var="_DIRNAME_SHARED_SUFFIX">
                 <if cond="WX_SHARED=='0'">lib</if>
                 <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>
 
             <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
-                <set var="__mkdir_tgt">make_lib_dir_$(id)</set>
+                <set var="__mkdir_tgt">make_dir_$(id)</set>
 
                 <add-target target="$(__mkdir_tgt)" type="action"/>
                 <modify-target target="$(__mkdir_tgt)">
@@ -387,7 +417,7 @@
                     <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>
@@ -413,7 +443,7 @@
     </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">
@@ -436,6 +466,11 @@
         -->
     </define-tag>
 
+
+
+    <!--                   UTILITY GLOBAL TAGS                      -->
+    <!--                                                            -->
+
     <!-- Sets the BUILDDIR variable using the same rules used by wxWidgets itself.
          This makes it possible to keep separed the object files compiled with
          different configuration settings.
@@ -449,9 +484,68 @@
             </set>
 
             <set var="BUILDDIR">
-                $(COMPILER)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
+                $(COMPILER_PREFIX)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
             </set>
         </if>
     </define-global-tag>
 
+    <!-- Sets a variable with the name of the 'var' attribute value using the
+         same rules used for wxWidgets library naming.
+         E.g.
+
+            <set-wxlike var='MYMODULE_LIBNAME' prefix='mylib'>
+                mymodule
+            </set-wxlike>
+
+         This tag also supports a 'cond' attribute making it very powerful
+         for conditional linking a wx-based library:
+
+            <option name="USE_MYMODULE">
+                <values>0,1</values>
+            </option>
+            <set-wxlike var='MYMODULE_DEP'
+                        prefix='mylib'
+                        cond="USE_MYMODULE=='1'">
+                mymodule
+            </set-wxlike>
+            ...
+            <exe id="myexe">
+                <sys-lib>$(MYMODULE_DEP)</sys-lib>
+            </exe>
+    -->
+    <define-global-tag name="set-wxlike">
+        <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">
+            <if cond="'cond' not in attributes">
+                <set var="$(attributes['var'])">
+                    $(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
+                </set>
+            </if>
+            <if cond="'cond' in attributes">
+                <set var="$(attributes['var'])">
+                    <if cond="$(attributes['cond'])">
+                        $(attributes['prefix'])_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)
+                    </if>
+                </set>
+            </if>
+        </if>
+
+        <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">
+            <if cond="'cond' not in attributes">
+                <set var="$(attributes['var'])">
+                    $(attributes['prefix'])_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+                </set>
+            </if>
+            <if cond="'cond' in attributes">
+                <set var="$(attributes['var'])">
+                    <if cond="$(attributes['cond'])">
+                        $(attributes['prefix'])_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+                    </if>
+                </set>
+            </if>
+        </if>
+    </define-global-tag>
+
+
+    <include file="wx_xrc.bkl"/>
+
 </makefile>