X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83c7f6a7acb234411ca18bf59092fea7c018af63..bd018e7e31361bc2112a386f18663908a0559d58:/build/bakefiles/wxpresets/presets/wx_win32.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 0eae900a91..6d4f19b509 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -34,7 +34,7 @@ FIXME: this template has (at least) the following bugs:
     <!--    In MSVC these are the different build                   -->
     <!--    configurations you can have (in the build menu),        -->
     <!--    and in autoconf is enabled with enable-xxx=xx.          -->
-    <!--    For other compilers a seperate configuration            -->
+    <!--    For other compilers a separate configuration            -->
     <!--    file is created (such as config.gcc on gcc)             -->
     <!--    which has several options a user can modify.            -->
     <!--                                                            -->
@@ -42,9 +42,18 @@ FIXME: this template has (at least) the following bugs:
     <!--    is not constant, i.e. if it cannot be determined        -->
     <!--    by bakefile itself.                                     -->
 
+    <!-- this is a temporary variable until there is non general    -->
+    <!-- function in bakefiles for returning native markup for      -->
+    <!-- reading envrionment variables                              -->
+    <set var="ENV_VAR">
+        <if cond="FORMAT=='watcom'">%</if>
+        <if cond="FORMAT!='watcom'"></if>
+    </set>
+    
     <!-- The directory where wxWidgets is installed: -->
+    <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
     <option name="WX_DIR" category="path">
-        <default-value>$(DOLLAR)(WXWIN)</default-value>
+        <default-value>$(WX_DIR_DEFAULT)</default-value>
         <description>
             The directory where wxWidgets library is installed
         </description>
@@ -53,10 +62,11 @@ FIXME: this template has (at least) the following bugs:
     <!--    This is a standard option that determines               -->
     <!--    whether the user wants to build this library as         -->
     <!--    a dll or as a static library.                           -->
+    <set var="WX_SHARED_DEFAULT" overwrite="0">0</set>
     <option name="WX_SHARED">
         <values>0,1</values>
         <values-description>,DLL</values-description>
-        <default-value>0</default-value>
+        <default-value>$(WX_SHARED_DEFAULT)</default-value>
         <description>
             Use DLL build of wx library to use?
         </description>
@@ -64,26 +74,29 @@ FIXME: this template has (at least) the following bugs:
 
     <!-- Configuration for building the bakefile with               -->
     <!-- unicode strings or not (unicode or ansi).                  -->
+    <set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
     <option name="WX_UNICODE">
         <values>0,1</values>
         <values-description>,Unicode</values-description>
-        <default-value>0</default-value>        
+        <default-value>$(WX_UNICODE_DEFAULT)</default-value>        
         <description>
             Compile Unicode build of wxWidgets?
         </description>
     </option>
 
+    <set var="WX_DEBUG_DEFAULT" overwrite="0">1</set>
     <option name="WX_DEBUG">
         <values>0,1</values>
         <values-description>,Debug</values-description>
-        <default-value>1</default-value>
+        <default-value>$(WX_DEBUG_DEFAULT)</default-value>
         <description>
             Use debug build of wxWidgets (define __WXDEBUG__)?
         </description>
     </option>
 
+    <set var="WX_VERSION_DEFAULT" overwrite="0">26</set>
     <option name="WX_VERSION">
-        <default-value>25</default-value>
+        <default-value>$(WX_VERSION_DEFAULT)</default-value>
         <description>
             Version of the wx library to build against.
         </description>
@@ -115,8 +128,8 @@ FIXME: this template has (at least) the following bugs:
         <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
         <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
     </set>
-    <set var="WXSUBLIBPOSTFIX">
-        <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
+    <set var="WX3RDPARTLIBPOSTFIX">
+        <if cond="WX_DEBUG=='1'">d</if>
     </set>
 
     <set var="WXLIBPATH">
@@ -142,7 +155,7 @@ FIXME: this template has (at least) the following bugs:
     <!--                                                            -->
     <!--    The "base class" of all our build targets               -->
     <!--    This links with the appropriate native                  -->
-    <!--    libraries required by the platform, the libaries        -->
+    <!--    libraries required by the platform, the libraries       -->
     <!--    we want for our stuff, and the wxWindows libs.          -->
 
 
@@ -152,7 +165,7 @@ FIXME: this template has (at least) the following bugs:
         <if cond="value=='base'">
             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</sys-lib>
         </if>
-        <if cond="value in ['net','xml']">
+        <if cond="value in ['net','xml', 'odbc']">
             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
         </if>
         <if cond="value not in ['base','net','xml']">
@@ -165,9 +178,12 @@ FIXME: this template has (at least) the following bugs:
     <define-tag name="__wx-libs-point" rules="exe,dll,module"/>
     <tag-info name="wx-lib"
               position="before:__wx-libs-point"/>
+    <tag-info name="__wx-syslibs"
+              position="after:__wx-libs-point"/>
     
 
-    <template id="wx">
+    <!-- template for static wx libraries: -->
+    <template id="wx-lib">
         <!--                    MISCELLANEOUS                       -->
         <if cond="FORMAT=='mingw'">                    
             <define>HAVE_W32API_H</define>
@@ -180,23 +196,23 @@ FIXME: this template has (at least) the following bugs:
 
         <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
         <include>$(WX_DIR)/include</include>
-
-        <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
-
-        <!-- wx libs must come before 3rd party and sys libs, this is
-             the place where the hack explained above is carried on: -->
-        <__wx-libs-point/>
-
+    </template>
+    
+    
+    <!-- this ugly tag contains all sys-lib tags used by "wx" template,
+         in order to make sure they are not reorder when wx-lib is moved
+         after __wx-libs-point: -->
+    <define-tag name="__wx-syslibs" rules="exe,dll,module">
         <!-- wx 3rd party libs, always use them: -->
-        <sys-lib>wxtiff$(WXSUBLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxjpeg$(WXSUBLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxpng$(WXSUBLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxzlib$(WXSUBLIBPOSTFIX)</sys-lib> 
-        <!-- For regex we won't use the WXSUBLIBPOSTIX postfix: 
+        <sys-lib>wxtiff$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxjpeg$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxpng$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
+        <sys-lib>wxzlib$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
+        <!-- For regex we won't use the WX3RDPARTLIBPOSTIX postfix: 
              unliked tiff, jpeg, png, zlib, expat, when building
              in Unicode mode, the "u" suffix is appended to regex -->
         <sys-lib>wxregex$(WXLIBPOSTFIX)</sys-lib> 
-        <sys-lib>wxexpat$(WXSUBLIBPOSTFIX)</sys-lib>
+        <sys-lib>wxexpat$(WX3RDPARTLIBPOSTFIX)</sys-lib>
    
         <!-- link-in system libs that wx depends on: -->
         <!-- If on borland, we don't need to do much            -->
@@ -227,6 +243,16 @@ FIXME: this template has (at least) the following bugs:
         <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
             <sys-lib>oleacc</sys-lib>
         </if>
+    </define-tag>
+   
+    <!-- template for wx executables/dlls: -->
+    <template id="wx" template="wx-lib">
+        <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
+
+        <!-- wx libs must come before 3rd party and sys libs, this is
+             the place where the hack explained above is carried on: -->
+        <__wx-libs-point/>
+        <__wx-syslibs/>
     </template>
 
 </makefile>