X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83c7f6a7acb234411ca18bf59092fea7c018af63..6d8edd32b5041d1124b5cbe03e281062ae0220a7:/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..9aeb1a51f6 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -42,9 +42,17 @@ 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: -->
     <option name="WX_DIR" category="path">
-        <default-value>$(DOLLAR)(WXWIN)</default-value>
+        <default-value>$(DOLLAR)($(ENV_VAR)WXWIN)</default-value>
         <description>
             The directory where wxWidgets library is installed
         </description>
@@ -115,8 +123,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">
@@ -167,7 +175,8 @@ FIXME: this template has (at least) the following bugs:
               position="before:__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,7 +189,11 @@ FIXME: this template has (at least) the following bugs:
 
         <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
         <include>$(WX_DIR)/include</include>
-
+    </template>
+    
+   
+    <!-- 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
@@ -188,15 +201,15 @@ FIXME: this template has (at least) the following bugs:
         <__wx-libs-point/>
 
         <!-- 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            -->