STL-ification patch for wxMSW and wxGTK.

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 4d30154a412ce22b6fbcc272ba31a76626b26b06..2738821ff28cb661e8ab30233be8aa7d2ca846ff 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -72,7 +72,7 @@
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>

-                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r ../src/mac/corersrc.r -o $(MACOS_RSRC)
+                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o $(MACOS_RSRC)

                 $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
                 $(DEREZ) $(MACOS_RSRC) Carbon.r -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>


@@ -92,18 +92,26 @@
     <!-- copy setup.h on Windows: -->    
     <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
         <mkdir id="libdir">
     <!-- copy setup.h on Windows: -->    
     <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
         <mkdir id="libdir">

+            <dir>$(LIBDIRNAME)</dir>
+        </mkdir>
+        <mkdir id="libdir_wx">
+            <depends>libdir</depends>

             <dir>$(LIBDIRNAME)/wx</dir>
         </mkdir>
             <dir>$(LIBDIRNAME)/wx</dir>
         </mkdir>

+        

         <copy-file-to-file id="msw/setup.h">
             <src>$(SRCDIR)/include/wx/msw/setup0.h</src>
             <dst>$(SRCDIR)/include/wx/msw/setup.h</dst>
         </copy-file-to-file>
         <copy-file-to-file id="setup.h">
             <depends>msw/setup.h</depends>
         <copy-file-to-file id="msw/setup.h">
             <src>$(SRCDIR)/include/wx/msw/setup0.h</src>
             <dst>$(SRCDIR)/include/wx/msw/setup.h</dst>
         </copy-file-to-file>
         <copy-file-to-file id="setup.h">
             <depends>msw/setup.h</depends>

-            <depends>libdir</depends>
+            <depends>libdir_wx</depends>

             <src>$(SRCDIR)/include/wx/msw/setup.h</src>
             <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
         </copy-file-to-file>
             <src>$(SRCDIR)/include/wx/msw/setup.h</src>
             <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
         </copy-file-to-file>

+        <phony id="setup_h">
+            <depends>setup.h</depends>
+        </phony>

     </if>
 
 </makefile>
     </if>
 
 </makefile>