Make wxMin, wxMax and wxClip template functions.

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 07f482ee13a49efb5eec845717d0a4a9535a2663..ce138b6daf149ec0ad5d31e90d906b582c67dec3 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -87,7 +87,7 @@
 
         <data-files>
             <srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>
 
         <data-files>
             <srcdir>$(SRCDIR)/build/bakefiles/wxpresets/presets</srcdir>

-            <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl</files>
+            <files>wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py</files>

             <install-to>$(DATADIR)/bakefile/presets</install-to>
         </data-files>
 
             <install-to>$(DATADIR)/bakefile/presets</install-to>
         </data-files>
 


@@ -101,6 +101,12 @@
             </command>
         </action>
 
             </command>
         </action>
 

+        <modify-target target="install">
+            <command>
+                $(DYLIB_RPATH_INSTALL)
+            </command>
+        </modify-target>
+

         <set var="RCDEFS_H">
             <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
         </set>
         <set var="RCDEFS_H">
             <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
         </set>


@@ -248,7 +254,7 @@
 @echo " wxWidgets comes with no guarantees and doesn't claim"
 @echo " to be suitable for any purpose."
 @echo " "
 @echo " wxWidgets comes with no guarantees and doesn't claim"
 @echo " to be suitable for any purpose."
 @echo " "

-@echo " Read the wxWidgets Licence on licencing conditions."
+@echo " Read the wxWindows Licence on licencing conditions."

 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "
 @echo " "
 @echo " ------------------------------------------------------"
 @echo " "