don't use precompiled headers with wxSTC

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index f97635575d14eb96db05dce0eb64b10cb21115b1..1f2c95c65392f324e14e711b6c7f3ffb3b0520e1 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -276,19 +276,23 @@
     </template>
     
 
     </template>
     
 

+    <set var="WX_DISABLE_PRECOMP_HEADERS" overwrite="0">0</set>
+    

     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
 

-        <if cond="FORMAT!='autoconf'">
-            <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
-            <precomp-headers-gen>
-                $(WXTOPDIR)src/msw/dummy.cpp
-            </precomp-headers-gen>
+        <if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
+            <if cond="FORMAT!='autoconf'">
+                <sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
+                <precomp-headers-gen>
+                    $(WXTOPDIR)src/msw/dummy.cpp
+                </precomp-headers-gen>
+            </if>
+            <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
+            <precomp-headers>on</precomp-headers>
+            <precomp-headers-file>wxprec_$(id)</precomp-headers-file>

         </if>
         </if>

-        <precomp-headers-header>wx/wxprec.h</precomp-headers-header>
-        <precomp-headers>on</precomp-headers>
-        <precomp-headers-file>wxprec_$(id)</precomp-headers-file>

     </template>
 
     <template id="wx_dll_b" template="wx_lib_b">
     </template>
 
     <template id="wx_dll_b" template="wx_lib_b">

diff --git a/contrib/build/stc/stc.bkl b/contrib/build/stc/stc.bkl
index e0a1b923efd9eb541fef06ca95bca6457c967730..517b5752e32c3af112e77da434bfe5560092a9ff 100644 (file)
--- a/contrib/build/stc/stc.bkl
+++ b/contrib/build/stc/stc.bkl
@@ -3,6 +3,7 @@
 
 <makefile>
 
 
 <makefile>
 

+    <set var="WX_DISABLE_PRECOMP_HEADERS">1</set>

     <include file="../../../build/bakefiles/common_contrib.bkl"/>
 
     <set var="STC_SRC">
     <include file="../../../build/bakefiles/common_contrib.bkl"/>
 
     <set var="STC_SRC">