X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/328f5196bbe6a5e8507ee21f0ef08d011102f185..bf5ff0c308f38727c0c791ca11cd7697112f4566:/build/bakefiles/common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 36fb51ee46..38be4fa522 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -279,7 +279,9 @@
         <define>$(WXUNIV_DEFINE)</define>
         <define>$(DEBUG_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>
-        <include>$(TOP_SRCDIR)include</include>
+        <!-- this include is added by configure, we need to put other
+             includes before it: -->
+        <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
         <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <warnings>max</warnings>
@@ -304,7 +306,7 @@
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
             </if>
-            <if cond="FORMAT!='bcc'">
+            <if cond="FORMAT!='borland'">
                 <sys-lib>kernel32</sys-lib>
                 <sys-lib>user32</sys-lib>
                 <sys-lib>gdi32</sys-lib>
@@ -321,10 +323,10 @@
                 <sys-lib>advapi32</sys-lib>
                 <sys-lib>wsock32</sys-lib>
             </if>
-            <if cond="FORMAT=='vc' or FORMAT=='bcc'">
+            <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
             </if>
-        </if>        
+        </if>
     </template>
 
     <define-tag name="msvc-headers" rules="dll,lib">