Include wx/palette.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 1413af71c4ac469776851b983230a7076adae77a..2eb036a7708ae45cdf35e2fcfff0bc7ca854b788 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -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>
@@ -212,7 +212,10 @@
 
         <action id="rcdefs.h">
 
-            <is-phony>1</is-phony>
+            <!-- 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>