speed up SetColumnWidth() by caching max column width (patch 1156866)

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index bec77bf7ce6e7461dab005f0d7e7c455f8cb744e..f891ad73f59b84ebc256c0f6dac9eb77936c8c14 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -50,6 +50,16 @@
              conditional and optional subprojects is needed -->
         <action id="wxrc" cond="USE_XRC=='1'">
             <dependency-of>all</dependency-of>
              conditional and optional subprojects is needed -->
         <action id="wxrc" cond="USE_XRC=='1'">
             <dependency-of>all</dependency-of>

+
+            <!-- some of these are not built in all configurations, <depends>
+                 takes care of ignoring the disabled ones: -->
+            <depends>monodll</depends>
+            <depends>monolib</depends>
+            <depends>basedll</depends>
+            <depends>baselib</depends>
+            <depends>xmldll</depends>
+            <depends>xmllib</depends>
+            

             <command>
                 (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
             </command>
             <command>
                 (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
             </command>


@@ -62,6 +72,7 @@
         </action>
         <action id="install-wxrc" cond="USE_XRC=='1'">
             <dependency-of>install</dependency-of>
         </action>
         <action id="install-wxrc" cond="USE_XRC=='1'">
             <dependency-of>install</dependency-of>

+            <depends>wxrc</depends>

             <command>
                 (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
             </command>
             <command>
                 (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
             </command>


@@ -74,15 +85,6 @@
             <install-to>$(DATADIR)/aclocal</install-to>
         </data-files>
 
             <install-to>$(DATADIR)/aclocal</install-to>
         </data-files>
 

-        <data-files-tg id="install-afm" cond="USE_GUI=='1'">
-            <files>misc/afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/$(WX_RELEASE)/afm</install-to>
-        </data-files-tg>
-        <data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
-            <files>misc/gs_afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/$(WX_RELEASE)/gs_afm</install-to>
-        </data-files-tg>
-

         <action id="install-wxconfig">
             <dependency-of>install</dependency-of>
             <command>
         <action id="install-wxconfig">
             <dependency-of>install</dependency-of>
             <command>