X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18cea8715ac7467515bb9df95a5b565023956a2c..d7e0343413296e8719386abbcb55ecbc4dceba36:/build/bakefiles/wxpresets/presets/wx.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl
index 77b6d32a6b..e2b6bdf485 100644
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -89,9 +89,7 @@
         <wx-lib>aui</wx-lib>
         <wx-lib>stc</wx-lib>
         <wx-lib>qa</wx-lib>
-        <wx-lib>dbgrid</wx-lib>
         <wx-lib>gl</wx-lib>
-        <wx-lib>odbc</wx-lib>
         <wx-lib>xrc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>media</wx-lib>
@@ -119,7 +117,17 @@
                          tag definitions.
     -->
     <set var="WX_LIB_LIST">
-        base core net xml odbc xrc html adv media gl dbgrid qa aui richtext stc
+        base core net xml xrc html adv media gl qa aui richtext stc
+    </set>
+
+    <!-- if you define this variable to 0 before including wx presets, the
+         "test_for_selected_wxbuild" target which is added by default in win32 and GNU 
+         makefiles, won't be added.
+         This is useful when e.g. you want to have wxWidgets as an optional
+         dependency and thus you don't want to perform that check unconditionally.
+    -->
+    <set var="WX_TEST_FOR_SELECTED_WXBUILD" overwrite="0">
+        1
     </set>
 
     <!-- this is a temporary variable until there is non general    -->
@@ -237,7 +245,7 @@
     <!-- The directory where wxWidgets is installed: -->
     <if cond="not isdefined('WX_DIR')">
         <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
-        <option name="WX_DIR" category="path">
+        <option name="WX_DIR" category="path" never_empty="1">
             <default-value>$(WX_DIR_DEFAULT)</default-value>
             <description>
                 The directory where wxWidgets library is installed
@@ -262,7 +270,8 @@
 
 
 
-    <!-- this is just a wrapper that includes the real implementation: -->
+    <!--                    REAL IMPLEMENTATION                     -->
+    <!--                                                            -->
 
     <set var="__wx_included_impl">0</set>
 
@@ -276,6 +285,13 @@
         <set var="__wx_included_impl">1</set>
     </if>
 
+    <if cond="FORMAT=='xcode2'">
+        <!-- xCode2 is an IDE and thus reuses almost nothing from unix part of wxpresets;
+             better use the win32 part! -->
+        <include file="wx_win32.bkl"/>
+        <set var="__wx_included_impl">1</set>
+    </if>
+
     <if cond="__wx_included_impl=='0'">
         <error>This format is not (yet) supported by wx preset.</error>
     </if>
@@ -387,7 +403,7 @@
                     <command cond="TOOLSET in ['win32','os2','dos']">
                         if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
                     </command>
-            </modify-target>
+                </modify-target>
 
                 <!-- the following code is mostly equivalent to a:
                           <dependency-of>$(id)</dependency-of>