wxMessageBox off the main thread lost result code.

[wxWidgets.git] / build / bakefiles / wxpresets / presets / wx.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl
index ff06b7f6fd803c7428e07f222d9ebf781279667d..245b95f48473c71d116ca7d214872641293d2006 100644 (file)
--- 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>
@@ -124,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
@@ -273,7 +273,9 @@
         <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
     </set>
 
-    <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
+    <if cond="FORMAT!='autoconf'">
+        <set var="COMPILER_PREFIX" make_var="1">$(COMPILER)</set>
+    </if>
 
 
 
@@ -389,7 +391,7 @@
 
     <!-- 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
+         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">
@@ -470,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">