fixed DSW dependencies for samples

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 7de10f2a767d96a4c0aa17e1e51f89aa5e33dc4a..55e51884baaec42559ace2915847d3452630e566 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -92,6 +92,23 @@
                 $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
             </command>
         </action>
+        <action id="cocoa-res" cond="TOOLKIT=='COCOA'">
+            <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)
+                $(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
+            </command>
+            <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
+        </action>
+        <action id="cocoa-res-install" cond="TOOLKIT=='COCOA'">
+            <dependency-of>install</dependency-of>
+            <depends>macos-res</depends>
+            <command>
+                $(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
+                $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
+            </command>
+        </action>
 
     </if>
 
@@ -106,16 +123,21 @@
             <dependency-of>setup_h</dependency-of>
             <dir>$(LIBDIRNAME)/wx</dir>            
         </mkdir>
+
+        <set var="SETUP_H_DIR">
+            <if cond="WXUNIV=='1'">univ</if>
+            <if cond="WXUNIV=='0'">msw</if>
+        </set>
         
-        <copy-file-to-file-if-not-exist id="msw/setup.h">
-            <src>$(SRCDIR)/include/wx/msw/setup0.h</src>
-            <dst>$(SRCDIR)/include/wx/msw/setup.h</dst>
+        <copy-file-to-file-if-not-exist id="master_setup.h">
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup0.h</src>
+            <dst>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</dst>
             <dependency-of>setup_h</dependency-of>
         </copy-file-to-file-if-not-exist>
         <copy-file-to-file-if-not-exist id="setup.h">
             <dependency-of>setup_h</dependency-of>
-            <src>$(SRCDIR)/include/wx/msw/setup.h</src>
-            <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</src>
+            <dst>$(LIBDIRNAME)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
     </if>