add #if wxUSE_TOOLTIPS around DoSetToolTip()

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 8003f5f982cebff62226ec1e7d559e9e61a313de..4e5c0177135355a1e8af86a14a5210592d3517c7 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -61,20 +61,20 @@
             <depends>xmllib</depends>
 
             <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all ; fi)
             </command>
         </action>
         <action id="clean-wxrc" cond="USE_XRC=='1'">
             <dependency-of>clean</dependency-of>
             <command>
-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean) || true
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean ; fi)
             </command>
         </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
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install ; fi)
             </command>
         </action>
 
@@ -97,24 +97,24 @@
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
                 $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
             </command>
         </action>
 
         <set var="RCDEFS_H">
-            <if cond="TOOLKIT=='MSW'">
-                lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/msw/rcdefs.h
-            </if>
+            <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
         </set>
-
-        <data-files>
-            <srcdir>$(BUILDDIR)</srcdir>
+        <headers>
+            <srcdir>
+                $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+            </srcdir>
             <files>
-                lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h
-                $(RCDEFS_H)
+                setup.h $(RCDEFS_H)
             </files>
-            <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx</install-to>
-        </data-files>
+            <install-to>
+                $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+            </install-to>
+        </headers>
 
         <headers>
             <srcdir>$(SRCDIR)/include</srcdir>
@@ -150,7 +150,7 @@
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>
-                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
+                $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
                 $(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
@@ -203,7 +203,7 @@
 
 
     <!-- create rcdefs.h on Windows: -->
-    <if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+    <if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
 
         <mkdir id="libdir_setup_wx_msw">
             <depends>libdir_setup_wx</depends>
@@ -212,6 +212,10 @@
 
         <action id="rcdefs.h">
 
+            <!-- Can't seem to set id to a name with a dollar sign
+                 so use __targetname as a temporary work around -->
+            <set var="__targetname">$(SETUPHDIR)\wx\msw\rcdefs.h</set>
+
             <dependency-of>setup_h</dependency-of>
             <depends>libdir_setup_wx_msw</depends>
             <depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>