X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d..931d6a47c32a5b4c283243cb553ce71ee2b535d5:/build/bakefiles/wxpresets/presets/wx.bkl?ds=sidebyside

diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl
index 5c0281bb5b..245b95f484 100644
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 
 <!--
     Presets for building wxWidgets applications.
@@ -89,6 +88,7 @@
  NOTE: as a reference here is a list of all wxWidgets libraries satisfying
        the dependency constraints mentioned in <wx-lib> description:
 
+        <wx-lib>webview</wx-lib>
         <wx-lib>richtext</wx-lib>
         <wx-lib>aui</wx-lib>
         <wx-lib>ribbon</wx-lib>
@@ -112,6 +112,7 @@
 
     <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.
@@ -123,7 +124,7 @@
                          tag definitions.
     -->
     <set var="WX_LIB_LIST">
-        base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc
+        base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview
     </set>
 
     <!-- if you define this variable to 0 before including wx presets, the
@@ -272,6 +273,10 @@
         <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>
+
 
 
 
@@ -385,8 +390,8 @@
     </define-tag>
 
     <!-- Sets as output folder for the current target a directory
-         called "$(value)/$(COMPILER)_lib|dll", just like wxWidgets does.
-         This makes it possible to keep separed the libraries/exes compiled with
+         called "$(value)/$(COMPILER_PREFIX)_lib|dll", just like wxWidgets does.
+         This makes it possible to keep separated the libraries/exes compiled with
          different compilers and with a different value for WX_SHARED.
     -->
     <define-tag name="wxlike-dirname" rules="lib,dll,exe,module">
@@ -396,7 +401,7 @@
                 <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>
@@ -467,7 +472,7 @@
     <!--                                                            -->
 
     <!-- Sets the BUILDDIR variable using the same rules used by wxWidgets itself.
-         This makes it possible to keep separed the object files compiled with
+         This makes it possible to keep separated the object files compiled with
          different configuration settings.
     -->
     <define-global-tag name="set-wxlike-builddir">
@@ -479,7 +484,7 @@
             </set>
 
             <set var="BUILDDIR">
-                $(COMPILER)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
+                $(COMPILER_PREFIX)$(WX_PORT)$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)
             </set>
         </if>
     </define-global-tag>