X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d65cbb3788e6df967214854de6d0a796b607e7ca..71696da09ee2e7a6c2cf12ac45537a084d168c47:/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 39b4e57820..35063a6ad2 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -120,7 +120,6 @@
 
     <define-wxbase-lib-name>net</define-wxbase-lib-name>
     <define-wxbase-lib-name>xml</define-wxbase-lib-name>
-    <define-wxbase-lib-name>odbc</define-wxbase-lib-name>
 
 
     <!--   Libraries whose name is prefixed with 'wx' only          -->
@@ -147,9 +146,9 @@
     <define-wxlib-name>html</define-wxlib-name>
     <define-wxlib-name>adv</define-wxlib-name>
     <define-wxlib-name>qa</define-wxlib-name>
-    <define-wxlib-name>dbgrid</define-wxlib-name>
     <define-wxlib-name>gl</define-wxlib-name>
     <define-wxlib-name>aui</define-wxlib-name>
+    <define-wxlib-name>stc</define-wxlib-name>
     <define-wxlib-name>richtext</define-wxlib-name>
 
 
@@ -181,25 +180,24 @@
 
         <if cond="value=='net'"><sys-lib>$(WXLIB_NET_NAME)</sys-lib></if>
         <if cond="value=='xml'"><sys-lib>$(WXLIB_XML_NAME)</sys-lib></if>
-        <if cond="value=='odbc'"><sys-lib>$(WXLIB_ODBC_NAME)</sys-lib></if>
 
         <if cond="value=='media'"><sys-lib>$(WXLIB_MEDIA_NAME)</sys-lib></if>
         <if cond="value=='xrc'"><sys-lib>$(WXLIB_XRC_NAME)</sys-lib></if>
         <if cond="value=='html'"><sys-lib>$(WXLIB_HTML_NAME)</sys-lib></if>
         <if cond="value=='adv'"><sys-lib>$(WXLIB_ADV_NAME)</sys-lib></if>
         <if cond="value=='gl'"><sys-lib>$(WXLIB_GL_NAME)</sys-lib></if>
-        <if cond="value=='dbgrid'"><sys-lib>$(WXLIB_DBGRID_NAME)</sys-lib></if>
         <if cond="value=='qa'"><sys-lib>$(WXLIB_QA_NAME)</sys-lib></if>
         <if cond="value=='aui'"><sys-lib>$(WXLIB_AUI_NAME)</sys-lib></if>
         <if cond="value=='richtext'"><sys-lib>$(WXLIB_RICHTEXT_NAME)</sys-lib></if>
 
-        <!-- wx-lib can be used also to link against contrib libraries
-             (which always have the same name, regardless of WX_MONOLITHIC value) -->
-        <if cond="value in CONTRIBLIB_LIST.split()">
-            <sys-lib>wx$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
+        <if cond="value=='stc'">
+            <!-- wxSTC requires also the basic scintilla library
+                 which is built as a separate 3rd party library -->
+            <sys-lib>$(WXLIB_STC_NAME)</sys-lib>
+            <sys-lib>wxscintilla$(WX3RDPARTYLIBPOSTFIX)</sys-lib>
         </if>
 
-        <if cond="value not in ALLLIB_LIST.split()">
+        <if cond="value not in WX_LIB_LIST.split()">
             <error>Unknown wxWidgets library given in the wx-lib tag</error>
         </if>
     </define-tag>
@@ -251,7 +249,6 @@
         <!-- If on borland, we don't need to do much            -->
         <if cond="FORMAT=='borland'">
             <sys-lib>ole2w32</sys-lib>
-            <sys-lib>odbc32</sys-lib>
         </if>
 
         <!-- Non-borland, on the other hand...                  -->
@@ -270,7 +267,6 @@
             <sys-lib>rpcrt4</sys-lib>
             <sys-lib>advapi32</sys-lib>
             <sys-lib>wsock32</sys-lib>
-            <sys-lib>odbc32</sys-lib>
         </if>
 
         <!-- Libs common to both borland and MSVC               -->
@@ -289,7 +285,7 @@
         <__wx-syslibs/>
     </template>
 
-    <if cond="FORMAT_SUPPORTS_ACTIONS=='1'">
+    <if cond="FORMAT_SUPPORTS_ACTIONS=='1' and WX_TEST_FOR_SELECTED_WXBUILD=='1'">
 
         <!--
             VERY IMPORTANT: before starting to build all targets of the generated makefile,
@@ -306,7 +302,7 @@
                 @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
                     echo ----------------------------------------------------------------------------
                 @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
-                    echo Selected wxWidgets build is not available!
+                    echo The selected wxWidgets build is not available!
                 @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \
                     echo Please use the options prefixed with WX_ to select another wxWidgets build.
                 @if not exist $(WX_DIR)$(WXLIBINCLUDE)$(DIRSEP)wx$(DIRSEP)setup.h \