fixed cases where __WXMAC_CLASSIC__, __WXMAC_CARBON__, and __WXMAC_OSX__ were being...

[wxWidgets.git] / 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 fbc2759cc270eff2b78b47abc5022a0218d788f6..9aeb1a51f6cd3161ba3ab3d586bde6eabff86d05 100644 (file)
--- 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>
@@ -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