Patches from "Viktor Voroshylo" <viktor@voroshylo.com>

[wxWidgets.git] / build / bakefiles / common.bkl

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 29afb6b10a53593b77ef35c204b61eaffa29f39d..38be4fa52223f332563cefc5372935199782ee28 100644 (file)
--- 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>